gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #121 from ChrisBr/fix_dropdown

Browse source 
Fix dropdown on event index page
This commit is contained in:
Christian Bruckmayer 2014-05-14 11:20:21 +02:00
commit f01093196f
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/views/admin/events/index.html.haml
View file

@ -71,25 +71,25 @@
- l = link_to "Change", edit_admin_conference_event_speaker_path(@conference.short_title, event), :remote => true - l = link_to "Change", edit_admin_conference_event_speaker_path(@conference.short_title, event), :remote => true
= "(#{l})".html_safe = "(#{l})".html_safe
%td %td
.dropdown .btn-group
= link_to "#", :class => "dropdown-toggle", :id => "type-dropdown" do %button{:type=>"button", :class=>"btn btn-link dropdown-toggle", "data-toggle"=>"dropdown"}
- if event.event_type.nil? - if event.event_type.nil?
Event Type Event Type
- else - else
= event.event_type.title = event.event_type.title
<b class="caret"></b> %span.caret
%ul.dropdown-menu %ul.dropdown-menu
- @event_types.each do |type| - @event_types.each do |type|
%li= link_to type.title, admin_conference_event_path(@conference.short_title, event, :event_type_id => type.id) , %li= link_to type.title, admin_conference_event_path(@conference.short_title, event, :event_type_id => type.id) ,
:method => :put, :event_type_id => type.id :method => :put, :event_type_id => type.id
%td %td
.dropdown .btn-group
= link_to "#", :class => "dropdown-toggle", :id => "track-dropdown" do %button{:type=>"button", :class=>"btn btn-link dropdown-toggle", "data-toggle"=>"dropdown"}
- if event.track.nil? - if event.track.nil?
Track Track
- else - else
= event.track.name = event.track.name
<b class="caret"></b> %span.caret
%ul.dropdown-menu %ul.dropdown-menu
- @tracks.each do |track| - @tracks.each do |track|
%li= link_to track.name, admin_conference_event_path(@conference.short_title, event, :track_id => track.id) , %li= link_to track.name, admin_conference_event_path(@conference.short_title, event, :track_id => track.id) ,
@ -100,11 +100,11 @@
- if event.state == "withdrawn" - if event.state == "withdrawn"
Withdrawn Withdrawn
- else - else
.dropdown .btn-group
= link_to "#", :class => "dropdown-toggle" do %button{:type=>"button", :class=>"btn btn-link dropdown-toggle", "data-toggle"=>"dropdown"}
= event.state.humanize = event.state.humanize
<b class="caret"></b> %span.caret
%ul.dropdown-menu %ul.dropdown-menu{:role=>"menu"}
- if event.transition_possible? :accept - if event.transition_possible? :accept
%li= link_to 'Accept event', %li= link_to 'Accept event',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept), update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept),

2
spec/features/proposal_spec.rb
View file

@ -66,7 +66,7 @@ feature Event do
visit admin_conference_events_path(conference.short_title) visit admin_conference_events_path(conference.short_title)
expect(page.has_content?('Example Proposal')).to be true expect(page.has_content?('Example Proposal')).to be true
click_link 'New' click_button 'New'
click_link "accept_event_#{event.id}" click_link "accept_event_#{event.id}"
expect(page.has_content?('Unconfirmed')).to be true expect(page.has_content?('Unconfirmed')).to be true