update calendar build_links for table builder

2 files changed, 31 insertions, 6 deletions

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 72d213953..27c944f5f 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -1,4 +1,5 @@
 class CalendarsController < ChouetteController
+  include WorkgroupSupport
   include PolicyChecker
   defaults resource_class: Calendar
   before_action :ransack_contains_date, only: [:index]
@@ -7,19 +8,30 @@ class CalendarsController < ChouetteController
 
   def index
     index! do
-      @calendars = ModelDecorator.decorate(@calendars, with: CalendarDecorator, context: {
-        workgroup: current_workgroup
-      })
+      @calendars = decorate_calendars(@calendars)
     end
   end
 
   def show
     show! do
-      @calendar = @calendar.decorate
+      @calendar = @calendar.decorate(context: {
+        workgroup: current_workgroup
+      })
     end
   end
 
   private
+
+  def decorate_calendars(calendars)
+    ModelDecorator.decorate(
+      calendars,
+      with: CalendarDecorator,
+      context: {
+        workgroup: current_workgroup
+      }
+    )
+  end
+
   def calendar_params
     permitted_params = [:id, :name, :short_name, :shared, periods_attributes: [:id, :begin, :end, :_destroy], date_values_attributes: [:id, :value, :_destroy]]
     permitted_params << :shared if policy(Calendar).share?
@@ -36,18 +48,19 @@ class CalendarsController < ChouetteController
 
   protected
   def resource
-    @calendar = Calendar.where('organisation_id = ? OR shared = true', current_organisation.id).find_by_id(params[:id])
+    @calendar = Calendar.where('(organisation_id = ? OR shared = ?) AND workgroup_id = ?', current_organisation.id).find_by_id(params[:id], true, @workgroup.id)
   end
 
   def build_resource
     super.tap do |calendar|
+      calendar.workgroup = current_workgroup
       calendar.organisation = current_organisation
     end
   end
 
   def collection
     return @calendars if @calendars
-    scope = Calendar.where('organisation_id = ? OR shared = ?', current_organisation.id, true)
+    scope = Calendar.where('(organisation_id = ? OR shared = ?) AND workgroup_id = ?', current_organisation.id, true, @workgroup.id)
     scope = shared_scope(scope)
     @q = scope.ransack(params[:q])
 
diff --git a/app/controllers/concerns/workgroup_support.rb b/app/controllers/concerns/workgroup_support.rb
new file mode 100644
index 000000000..a3b49bb12
--- /dev/null
+++ b/app/controllers/concerns/workgroup_support.rb
@@ -0,0 +1,12 @@
+module WorkgroupSupport
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :find_workgroup
+  end
+
+  def find_workgroup
+   @workgroup ||= Workgroup.find params[:workgroup_id]
+  end
+
+end