Merge 08624c5b53 into 5c4fba8b44

app/views/conference/_conference_details.html.haml

@@ -32,7 +32,7 @@
                   Sorry, no places left
             - if !current_user.nil? && current_user.proposal_count(conference) > 0
               = link_to "My Proposals", conference_program_proposal_index_path(conference.short_title), :class =>"btn btn-default"
-            - elsif conference.program.cfp_open?
+            - elsif can? :new, conference.program.events.new
               = link_to "Submit Proposal", new_conference_program_proposal_path(conference.short_title), :class =>"btn btn-default"
             - if current_user.nil? || !current_user.subscribed?(conference)
               = link_to 'Subscribe', conference_subscriptions_path(conference.short_title), method: :post, class: 'btn btn-default'

app/views/proposal/new.html.haml

@@ -61,6 +61,10 @@
                 = f.input :description, input_html: { rows: 5 }, label: 'Requirements', placeholder: 'Eg. Whiteboard, printer, or something like that.'
 
             %p.text-right
+              = f.semantic_fields_for :event_users do |event_user|
+                = event_user.inputs :user, :style => 'display: none'
+                = event_user.inputs :event_role, :style => 'display: none'
+
               = f.submit 'Create Proposal', class: 'btn btn-success'
 
         .tab-pane{role: 'tabpanel', id: 'signin'}