make email button visible in execution phase

hpi-swt2 · Jan 25, 2017 · 74bff47 · 74bff47
1 parent ba518d3
commit 74bff47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/views/events/_applicants_overview.html.erb b/app/views/events/_applicants_overview.html.erb
@@ -66,7 +66,7 @@
     </div>
 
     <div class="btn-group pull-right" role="group">
-      <% if  (can? :send_email, Email) && (@event.phase == :selection) %>
+      <% if  (can? :send_email, Email) && ((@event.phase == :selection)||(@event.phase == :execution)) %>
         <% if not @event.applications_classified? %>
           <div class="btn-group pull-right tooltip-wrapper has-tooltip" role="group" data-toggle="tooltip" title="<%= t '.unclassified_applications_left'%>">
             <%= button_tag t('.sending_acceptances'), type: 'button', class: 'send-emails-button btn btn-default', disabled: true %>

diff --git a/spec/views/events/show.html.erb_spec.rb b/spec/views/events/show.html.erb_spec.rb
@@ -120,7 +120,7 @@
       end
     end
   end
-  
+
   it "displays correct buttons in draft phase" do
     @event = assign(:event, FactoryGirl.create(:event, :in_draft_phase))
     sign_in(FactoryGirl.create(:user, role: :organizer))
@@ -188,8 +188,8 @@
     render
     expect(rendered).to_not have_link(t(:print_all, scope: 'events.applicants_overview'))
     expect(rendered).to_not have_link(t(:accept_all, scope: 'events.applicants_overview'))
-    expect(rendered).to_not have_link(t(:sending_acceptances, scope: 'events.applicants_overview'))
-    expect(rendered).to_not have_link(t(:sending_rejections, scope: 'events.applicants_overview'))
+    expect(rendered).to have_link(t(:sending_acceptances, scope: 'events.applicants_overview'))
+    expect(rendered).to have_link(t(:sending_rejections, scope: 'events.applicants_overview'))
     expect(rendered).to have_link(t(:show_participants, scope: 'events.participants'))
     expect(rendered).to_not have_button(t(:sending_acceptances, scope: 'events.applicants_overview'), disabled: true)
     expect(rendered).to_not have_button(t(:sending_rejections, scope: 'events.applicants_overview'), disabled: true)