First draft for including calendars into workgroup for having appropriate scoping

5 files changed, 10 insertions, 10 deletions

diff --git a/app/views/calendars/_filters.html.slim b/app/views/calendars/_filters.html.slim
index b5283c1e8..c1d8c47f7 100644
--- a/app/views/calendars/_filters.html.slim
+++ b/app/views/calendars/_filters.html.slim
@@ -1,4 +1,4 @@
-= search_form_for @q, url: calendars_path, builder: SimpleForm::FormBuilder, html: { method: :get, class: 'form form-filter' } do |f|
+= search_form_for @q, url: workgroup_calendars_path(current_workgroup), builder: SimpleForm::FormBuilder, html: { method: :get, class: 'form form-filter' } do |f|
   .ffg-row
     .input-group.search_bar
       = f.search_field :name_or_short_name_cont, class: 'form-control', placeholder: 'Indiquez un nom/nom court de calendrier...'
@@ -18,5 +18,5 @@
       = f.input :contains_date, as: :date, label: false, wrapper_html: { class: 'date smart_date' }, class: 'form-control', include_blank: true
 
   .actions
-    = link_to 'Effacer', calendars_path, class: 'btn btn-link'
+    = link_to 'Effacer', workgroup_calendars_path(current_workgroup), class: 'btn btn-link'
     = f.submit 'Filtrer', id: 'calendar_filter_btn', class: 'btn btn-default'
diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim
index 77478a624..d0544856d 100644
--- a/app/views/calendars/index.html.slim
+++ b/app/views/calendars/index.html.slim
@@ -1,7 +1,7 @@
 - breadcrumb :calendars
 - content_for :page_header_actions do
   - if policy(Calendar).create?
-    = link_to(t('actions.add'), new_calendar_path, class: 'btn btn-default')
+    = link_to(t('actions.add'), new_workgroup_calendar_path(current_workgroup), class: 'btn btn-default')
 
 .page_content
   .container-fluid
@@ -19,7 +19,7 @@
                 key: :name, \
                 attribute: 'name', \
                 link_to: lambda do |calendar| \
-                  calendar_path(calendar) \
+                  workgroup_calendar_path(current_workgroup, calendar) \
                 end \
               ), \
               TableBuilderHelper::Column.new( \
diff --git a/app/views/dashboards/_dashboard.html.slim b/app/views/dashboards/_dashboard.html.slim
index 075b94ddc..58cfcc542 100644
--- a/app/views/dashboards/_dashboard.html.slim
+++ b/app/views/dashboards/_dashboard.html.slim
@@ -22,13 +22,13 @@
     .panel.panel-default
       .panel-heading
         h3.panel-title.with_actions
-          = link_to I18n.t("activerecord.models.calendar", count: @dashboard.current_organisation.calendars.size), calendars_path
+          = link_to I18n.t("activerecord.models.calendar", count: @dashboard.current_organisation.calendars.size), workgroup_calendars_path(current_workgroup)
           div
-            = link_to '', calendars_path, class: ' fa fa-chevron-right pull-right'
+            = link_to '', workgroup_calendars_path(current_workgroup), class: ' fa fa-chevron-right pull-right'
       - if @dashboard.current_organisation.calendars.present?
         .list-group
           - @dashboard.current_organisation.calendars.order("updated_at desc").limit(5).each do |calendar|
-            = link_to calendar.name, calendar_path(calendar), class: 'list-group-item'
+            = link_to calendar.name, workgroup_calendars_path(current_workgroup, calendar), class: 'list-group-item'
       - else
         .panel-body
           em.small.text-muted
diff --git a/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim b/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim
index 3963d4cd4..1b7293d21 100644
--- a/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim
+++ b/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim
@@ -29,7 +29,7 @@
             span Jeux de données
           = link_to workbench_imports_path(current_offer_workbench), class: "list-group-item #{(params[:controller] == 'imports') ? 'active' : ''}" do
             span Import
-          = link_to calendars_path, class: 'list-group-item' do
+          = link_to workgroup_calendars_path(current_workgroup), class: 'list-group-item' do
             span Modèles de calendrier
           = link_to workbench_compliance_check_sets_path(current_offer_workbench), class: 'list-group-item' do
             span Rapport de contrôle
diff --git a/app/views/stif/dashboards/_dashboard.html.slim b/app/views/stif/dashboards/_dashboard.html.slim
index 64e7d4f96..c28696a94 100644
--- a/app/views/stif/dashboards/_dashboard.html.slim
+++ b/app/views/stif/dashboards/_dashboard.html.slim
@@ -60,12 +60,12 @@
           span.badge.ml-xs = @dashboard.calendars.count if @dashboard.calendars.present?
 
           div
-            = link_to '', calendars_path, class: ' fa fa-chevron-right pull-right', title: t('.see')
+            = link_to '', workgroup_calendars_path(current_workgroup), class: ' fa fa-chevron-right pull-right', title: t('.see')
 
       - if @dashboard.calendars.present?
         .list-group
           - @dashboard.calendars.first(5).each_with_index do |calendar, i|
-            = link_to calendar.name, calendar_path(calendar), class: 'list-group-item' if i < 6
+            = link_to calendar.name, workgroup_calendar_path(current_workgroup, calendar), class: 'list-group-item' if i < 6
 
       - else
         .panel-body