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

User/Person models merge

Browse source
This commit is contained in:
Stella Rouzi 2014-06-23 19:07:50 +03:00
parent 66b84e3660
commit 23bf55b66c
80 changed files with 1064 additions and 1221 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/event_attachments_controller.rb
View file

@ -25,7 +25,7 @@ class EventAttachmentsController < ApplicationController
return
end
if organizer_or_admin? || current_user.person == upload.event.submitter
if organizer_or_admin? || current_user == upload.event.submitter
send_file upload.attachment.path
else
raise ActionController::RoutingError.new('Not Found')
@ -52,7 +52,7 @@ class EventAttachmentsController < ApplicationController
if !organizer_or_admin?
begin
event = current_user.person.events.find(params[:proposal_id])
event = current_user.events.find(params[:proposal_id])
rescue Exception => e
# They certainly aren't allowed to attach a file to someone else's proposal
raise ActionController::RoutingError.new('Invalid proposal')
@ -81,7 +81,7 @@ class EventAttachmentsController < ApplicationController
end
def update
@proposal = current_user.person.events.find(params[:proposal_id])
@proposal = current_user.events.find(params[:proposal_id])
@upload = @proposal.event_attachments.find(params[:proposal_id])
respond_to do |format|
@ -98,7 +98,7 @@ class EventAttachmentsController < ApplicationController
def destroy
@proposal = Event.find(params[:proposal_id])
if organizer_or_admin? || current_user.person == @proposal.submitter
if organizer_or_admin? || current_user == @proposal.submitter
@upload = @proposal.event_attachments.find(params[:id])
end