Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests2

This commit is contained in:
Chrisbr 2014-05-13 15:53:38 +02:00
commit 53bc0a7dac
3 changed files with 23 additions and 18 deletions

View file

@ -106,21 +106,21 @@
<b class="caret"></b>
%ul.dropdown-menu
- if event.transition_possible? :accept
%li= link_to 'Accept event (no email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept, send_mail: false),
method: :patch, hint: 'Accept this event without sending an automated email.', id: 'accept_event'
%li= link_to 'Accept event (WITH email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept, send_mail: true),
method: :patch, hint: 'Accept this event and send an automated email.', id: 'accept_event_mail'
%li= link_to 'Accept event',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept),
method: :patch, id: 'accept_event'
- if @conference.email_settings.send_on_accepted?
%li= link_to 'Accept event (without email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept, send_mail: false),
method: :patch, hint: 'Accept this event without sending an automated email.', id: 'accept_event_without_mail'
- if event.transition_possible? :reject
%li= link_to 'Reject event (no email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :reject, send_mail: false),
method: :patch, confirm: 'Are you sure?',
hint: 'Reject this event without sending an automated email.', id: 'reject_event'
%li= link_to 'Reject event (WITH email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :reject, send_mail: true),
method: :patch, confirm: 'Are you sure?',
hint: 'Reject this event and send an automated email.', id: 'reject_event_mail'
%li= link_to 'Reject event',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :reject),
method: :patch, confirm: 'Are you sure?', id: 'reject_event'
- if @conference.email_settings.send_on_rejected?
%li= link_to 'Reject event (without email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :reject, send_mail: false),
method: :patch, confirm: 'Are you sure?', id: 'reject_event_without_mail'
- if event.transition_possible? :start_review
%li= link_to 'Start review',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :start_review),