Move update favorites to a separate action
Introduce a separate action `toggle_favorite` to update user favorites events. Otherwise users with permissions to update the event can have it as favorite.
This commit is contained in:
parent
f54df5922e
commit
a907c1da58
4 changed files with 23 additions and 24 deletions
|
|
@ -1,10 +1,11 @@
|
||||||
class ProposalsController < ApplicationController
|
class ProposalsController < ApplicationController
|
||||||
|
skip_authorization_check
|
||||||
before_action :authenticate_user!, except: [:show, :new, :create]
|
before_action :authenticate_user!, except: [:show, :new, :create]
|
||||||
load_resource :conference, find_by: :short_title
|
load_resource :conference, find_by: :short_title
|
||||||
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, :withdraw]
|
skip_authorize_resource :event, only: [:confirm, :restart, :toogle_favorite, :withdraw]
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@event = @program.events.new
|
@event = @program.events.new
|
||||||
|
|
@ -63,31 +64,28 @@ class ProposalsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
respond_to do |format|
|
@url = conference_program_proposal_path(@conference.short_title, params[:id])
|
||||||
format.html do
|
|
||||||
@url = conference_program_proposal_path(@conference.short_title, params[:id])
|
|
||||||
|
|
||||||
if @event.update(event_params)
|
if @event.update(event_params)
|
||||||
redirect_to conference_program_proposals_path(conference_id: @conference.short_title),
|
redirect_to conference_program_proposals_path(conference_id: @conference.short_title),
|
||||||
notice: 'Proposal was successfully updated.'
|
notice: 'Proposal was successfully updated.'
|
||||||
else
|
else
|
||||||
flash[:error] = "Could not update proposal: #{@event.errors.full_messages.join(', ')}"
|
flash[:error] = "Could not update proposal: #{@event.errors.full_messages.join(', ')}"
|
||||||
render action: 'edit'
|
render action: 'edit'
|
||||||
end
|
|
||||||
end
|
|
||||||
format.json do
|
|
||||||
user = User.find(params[:favourite_user_id])
|
|
||||||
users = @event.favourite_users
|
|
||||||
if users.include? user
|
|
||||||
@event.favourite_users.delete(user)
|
|
||||||
else
|
|
||||||
@event.favourite_users << User.find(params[:favourite_user_id])
|
|
||||||
end
|
|
||||||
render json: {}
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def toogle_favorite
|
||||||
|
user = User.find(params[:favourite_user_id])
|
||||||
|
users = @event.favourite_users
|
||||||
|
if users.include? user
|
||||||
|
@event.favourite_users.delete(user)
|
||||||
|
else
|
||||||
|
@event.favourite_users << User.find(params[:favourite_user_id])
|
||||||
|
end
|
||||||
|
render json: {}
|
||||||
|
end
|
||||||
|
|
||||||
def withdraw
|
def withdraw
|
||||||
authorize! :update, @event
|
authorize! :update, @event
|
||||||
@url = conference_program_proposal_path(@conference.short_title, params[:id])
|
@url = conference_program_proposal_path(@conference.short_title, params[:id])
|
||||||
|
|
|
||||||
|
|
@ -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" => conference_program_proposal_path(@conference.short_title, event.id), |
|
"data-url" => toogle_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
|
||||||
|
|
|
||||||
|
|
@ -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" => conference_program_proposal_path(@conference.short_title, event.id), |
|
"data-url" => toogle_favorite_conference_program_proposal_path(@conference.short_title, event.id), |
|
||||||
"data-user" => current_user.id }
|
"data-user" => current_user.id }
|
||||||
= event.title
|
= event.title
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -115,6 +115,7 @@ Osem::Application.routes.draw do
|
||||||
get :registrations
|
get :registrations
|
||||||
patch '/confirm' => 'proposals#confirm'
|
patch '/confirm' => 'proposals#confirm'
|
||||||
patch '/restart' => 'proposals#restart'
|
patch '/restart' => 'proposals#restart'
|
||||||
|
patch :toogle_favorite
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue