Added paper_trail, also starting work on the scheduler
This commit is contained in:
parent
90b30db9e8
commit
f86232bedf
35 changed files with 523 additions and 32137 deletions
13
app/controllers/admin/schedule_controller.rb
Normal file
13
app/controllers/admin/schedule_controller.rb
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
class Admin::ScheduleController < ApplicationController
|
||||
before_filter :verify_organizer
|
||||
layout "schedule"
|
||||
|
||||
def show
|
||||
@dates = @conference.start_date..@conference.end_date
|
||||
@tracks = @conference.tracks
|
||||
end
|
||||
|
||||
def update
|
||||
|
||||
end
|
||||
end
|
||||
|
|
@ -71,7 +71,8 @@ class EventAttachmentsController < ApplicationController
|
|||
end
|
||||
|
||||
def update
|
||||
@upload = EventAttachment.find(params[:proposal_id])
|
||||
@proposal = current_user.person.events.find(params[:proposal_id])
|
||||
@upload = @proposal.event_attachments.find(params[:proposal_id])
|
||||
|
||||
respond_to do |format|
|
||||
if @upload.update_attributes(params[:upload])
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ class ProposalController < ApplicationController
|
|||
@event = @person.events.find_by_id(params[:id])
|
||||
@attachments = @event.event_attachments
|
||||
|
||||
if @event.nil?
|
||||
if @event.nil? || !@conference.cfp_open?
|
||||
redirect_to(conference_proposal_index_path(:conference_id => @conference.short_title), :alert => 'Invalid proposal.')
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue