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

Add authorization for toggle_favorite and rename route

Browse source
This commit is contained in:
Stella Rouzi 2018-09-20 00:45:50 +03:00 • committed by Henne Vogelsang
parent 2485923319
commit 91629d9b92
5 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/proposals_controller.rb
View file

@ -6,7 +6,8 @@ class ProposalsController < ApplicationController
load_resource :program, through: :conference, singleton: true load_resource :program, through: :conference, singleton: true
load_and_authorize_resource :event, parent: false, through: :program load_and_authorize_resource :event, parent: false, through: :program
# We authorize manually in these actions # We authorize manually in these actions
skip_authorize_resource :event, only: [:confirm, :restart, :toogle_favorite, :withdraw] skip_authorize_resource :event, only: [:confirm, :restart, :withdraw]
def index def index
@event = @program.events.new @event = @program.events.new
@ -85,7 +86,8 @@ class ProposalsController < ApplicationController
render action: 'edit' render action: 'edit'
end end
end end
def toogle_favorite
def toggle_favorite
user = User.find(params[:favourite_user_id]) user = User.find(params[:favourite_user_id])
users = @event.favourite_users users = @event.favourite_users
if users.include? user if users.include? user

4
app/models/ability.rb
View file

@ -108,6 +108,10 @@ class Ability
event.users.include?(user) event.users.include?(user)
end end
can :toggle_favorite, Event do |event|
event.scheduled?
end
# can manage the commercials of their own events # can manage the commercials of their own events
can :manage, Commercial, commercialable_type: 'Event', commercialable_id: user.events.pluck(:id) can :manage, Commercial, commercialable_type: 'Event', commercialable_id: user.events.pluck(:id)

2
app/views/schedules/_event.html.haml
View file

@ -11,7 +11,7 @@
= link_to('#', onClick: 'starClicked();') do = link_to('#', onClick: 'starClicked();') do
%span#star-events{ class: "fa fa-lg #{ event.favourite_users.exists?(current_user.id) ? 'fa-star' : 'fa-star-o' }", | %span#star-events{ class: "fa fa-lg #{ event.favourite_users.exists?(current_user.id) ? 'fa-star' : 'fa-star-o' }", |
"aria-hidden" => "true", | "aria-hidden" => "true", |
"data-url" => toogle_favorite_conference_program_proposal_path(@conference.short_title, event.id), | "data-url" => toggle_favorite_conference_program_proposal_path(@conference.short_title, event.id), |
"data-user" => current_user.id } "data-user" => current_user.id }
%span.h3 %span.h3
= event.title = event.title

2
app/views/schedules/_schedule_item.html.haml
View file

@ -11,7 +11,7 @@
= link_to('#', onClick: 'starClicked();') do = link_to('#', onClick: 'starClicked();') do
%span#star{ class: "fa fa-lg #{ event.favourite_users.exists?(current_user.id) ? 'fa-star' : 'fa-star-o' }", | %span#star{ class: "fa fa-lg #{ event.favourite_users.exists?(current_user.id) ? 'fa-star' : 'fa-star-o' }", |
"aria-hidden" =>"true", | "aria-hidden" =>"true", |
"data-url" => toogle_favorite_conference_program_proposal_path(@conference.short_title, event.id), | "data-url" => toggle_favorite_conference_program_proposal_path(@conference.short_title, event.id), |
"data-user" => current_user.id } "data-user" => current_user.id }
= event.title = event.title

2
config/routes.rb
View file

@ -166,7 +166,7 @@ Osem::Application.routes.draw do
patch '/withdraw' => 'proposals#withdraw' patch '/withdraw' => 'proposals#withdraw'
patch '/confirm' => 'proposals#confirm' patch '/confirm' => 'proposals#confirm'
patch '/restart' => 'proposals#restart' patch '/restart' => 'proposals#restart'
patch :toogle_favorite patch :toggle_favorite
end end
end end
resources :tracks, except: :destroy do resources :tracks, except: :destroy do