mirror of
https://github.com/openSUSE/osem.git
synced 2026-08-13 19:54:02 +00:00
* Add ID and track to the event overview
* Get rid of the timezones in the schedule, need to deal with that on output * Skip auth token verfiy on schedule updates * Make it possible to withdraw confirmed submissions * Show if people are not registerd
This commit is contained in:
parent
2b5e40bc96
commit
73013bd3e6
14 changed files with 96 additions and 48 deletions
|
|
@ -1,7 +1,9 @@
|
|||
class Admin::EventsController < ApplicationController
|
||||
before_filter :verify_organizer
|
||||
layout "admin"
|
||||
around_filter :set_timezone_for_this_request
|
||||
# FIXME: The timezome should only be applied on output, otherwise
|
||||
# you get lost in timezone conversions...
|
||||
# around_filter :set_timezone_for_this_request
|
||||
|
||||
def set_timezone_for_this_request(&block)
|
||||
Time.use_zone(@conference.timezone, &block)
|
||||
|
|
@ -9,6 +11,7 @@ class Admin::EventsController < ApplicationController
|
|||
|
||||
def index
|
||||
@events = @conference.events
|
||||
@tracks = @conference.tracks
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.json { render :json => Event.where(:state => :confirmed) }
|
||||
|
|
@ -50,7 +53,7 @@ class Admin::EventsController < ApplicationController
|
|||
if params.has_key? :track_id
|
||||
@event.update_attribute(:track_id, params[:track_id])
|
||||
end
|
||||
redirect_to(admin_conference_event_path(@conference.short_title, @event), :notice => "Updated")
|
||||
redirect_back_or_to(admin_conference_event_path(@conference.short_title, @event), :notice => "Updated")
|
||||
end
|
||||
|
||||
def create
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue