gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #34 from differentreality/admin_events_list

Browse source 
Admin events list
This commit is contained in:
Henne Vogelsang 2013-07-29 04:40:25 -07:00
commit ef556f02ca
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/events_controller.rb
View file

@ -12,6 +12,7 @@ class Admin::EventsController < ApplicationController
@events = @conference.events
@tracks = @conference.tracks
@event_states = @events.state_machine.states.map
@event_types = @conference.event_types
respond_to do |format|
format.html
# Explicity call #to_json to avoid the use of EventSerializer