refs frab#124: filter conference list for crew

MetaMeute · Mar 20, 2014 · 0da8819 · 0da8819
1 parent 1ca4efa
commit 0da8819
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -65,7 +65,7 @@ def setup_crew_user_abilities
     when /orga/
       can :manage, CallForPapers
       can :manage, Conference
-      can :manage, Event
+      can :manage, Event, :conference_id => @conference.id
       can :manage, EventFeedback
       can :manage, EventRating
       can :manage, Person
@@ -80,7 +80,7 @@ def setup_crew_user_abilities
       can :manage, CallForPapers
       cannot :destroy, CallForPapers
       can :read, Conference
-      can :manage, Event
+      can :manage, Event, :conference_id => @conference.id
       can :read, EventFeedback
       can :manage, EventRating
       can :manage, Person
@@ -91,7 +91,7 @@ def setup_crew_user_abilities
       # everything from submitter
       can :read, CallForPapers
       can :read, Conference
-      can :read, Event
+      can :read, Event, conference_id: @conference.id
       can :submit, Event
       can :read, EventFeedback
       can :manage, EventRating, :person_id => @user.person.id

diff --git a/app/models/conference.rb b/app/models/conference.rb
@@ -42,6 +42,10 @@ class Conference < ActiveRecord::Base
 
   scope :creation_order, order("conferences.created_at DESC")
 
+  scope :accessible_by_crew, lambda { |user| 
+    joins(:conference_users).where(conference_users: {user_id: user})
+  }
+
   def self.current
     self.order("created_at DESC").first
   end

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -40,7 +40,10 @@
               %li.dropdown
                 = link_to t("switch_conference", :default => "Switch conference"), "#", :class => "dropdown-toggle"
                 %ul.dropdown-menu
-                  - conferences = Conference.order("created_at DESC")
+                  - if current_user.role == 'crew'
+                    - conferences = Conference.accessible_by_crew(current_user).order("created_at DESC")
+                  - else
+                    - conferences = Conference.order("created_at DESC")
                   - unless conferences.nil?
                     - conferences[0..19].each do |conference|
                       - unless @conference == conference