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

created tests for user ability

Browse source
This commit is contained in:
raluka 2015-08-26 13:07:13 +02:00
parent b780996128
commit e10a2491d3
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/models/ability.rb
View file

@ -137,9 +137,8 @@ class Ability
can :manage, Sponsor, conference_id: conf_ids_for_organizer
can :manage, SponsorshipLevel, conference_id: conf_ids_for_organizer
can :manage, Ticket, conference_id: conf_ids_for_organizer
can [:read, :create], Comment, commentable_type: 'Event',
commentable_id: Event.where(conference_id: conf_ids_for_organizer).pluck(:id)
can [:index, :create], Comment, commentable_type: 'Event',
commentable_id: Event.where(conference_id: conf_ids_for_organizer).pluck(:id)
end
def signed_in_with_cfp_role(user)
@ -158,8 +157,8 @@ class Ability
can :manage, CallForPaper, conference_id: conf_ids_for_cfp
can :manage, Commercial, commercialable_type: 'Event',
commercialable_id: Event.where(conference_id: conf_ids_for_cfp).pluck(:id)
can [:read, :create], Comment, commentable_type: 'Event',
commentable_id: Event.where(conference_id: conf_ids_for_cfp).pluck(:id)
can [:index, :create], Comment, commentable_type: 'Event',
commentable_id: Event.where(conference_id: conf_ids_for_cfp).pluck(:id)
end
def signed_in_with_info_desk_role(user)

2
app/views/layouts/_navigation.html.haml
View file

@ -25,7 +25,7 @@
%b.caret
%ul.dropdown-menu
= render 'layouts/user_menu'
- if can? :read, Comment
- if can? :index, Comment #TODO modify condition
%ul.nav.navbar-nav.navbar-right
%li.dropdown
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "unread-comments-preview"}