Members cannot create events for troops to which they don't belong

francois · Nov 12, 2018 · 02c1d1a · 02c1d1a
1 parent ad9e9f5
commit 02c1d1a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -36,6 +36,7 @@ def show
   def new
     @page_title = I18n.t("events.new.page_title")
     @event = Event.new
+    @event.troop = current_member.troops.first if current_member.troops.size == 1
   end
 
   def edit

diff --git a/app/models/member.rb b/app/models/member.rb
@@ -2,6 +2,8 @@ class Member < ApplicationRecord
   include HasSlug
 
   belongs_to :group
+  has_many :memberships,   dependent: :delete_all, autosave: true
+  has_many :troops,                                                           through: :memberships
   has_many :sessions,      dependent: :delete_all, autosave: true,            class_name: "MemberSession"
   has_many :domain_events, dependent: :delete_all, autosave: true, as: :model
 

diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
@@ -31,7 +31,11 @@
               <div class="grid-x grid-margin-x">
                 <div class="small-12 cell">
                   <%= form.label :troop_id %>
-                  <%= form.select :troop_id, options_from_collection_for_select(current_group.troops.sort_by(&:sort_key), :id, :name, @event.troop_id), include_blank: true %>
+                  <% if current_member.inventory_director? %>
+                    <%= form.select :troop_id, options_from_collection_for_select(current_group.troops.sort_by(&:sort_key), :id, :name, @event.troop_id), include_blank: true %>
+                  <% else %>
+                    <%= form.select :troop_id, options_from_collection_for_select(current_member.troops.sort_by(&:sort_key), :id, :name, @event.troop_id), include_blank: true %>
+                  <% end %>
                 </div>
             </fieldset>