Merge branch 'master' into 3562_ccset_affectation3562_ccset_affectation

2 files changed, 2 insertions, 2 deletions

diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim
index f17b5d4d4..0b58c0c72 100644
--- a/app/views/calendars/index.html.slim
+++ b/app/views/calendars/index.html.slim
@@ -16,7 +16,7 @@
                 key: :name, \
                 attribute: 'name', \
                 link_to: lambda do |calendar| \
-                  workgroup_calendar_path(current_workgroup, calendar) \
+                  workgroup_calendar_path(workgroup, calendar) \
                 end \
               ), \
               TableBuilderHelper::Column.new( \
diff --git a/app/views/time_tables/_form.html.slim b/app/views/time_tables/_form.html.slim
index d06fdf444..007044e65 100644
--- a/app/views/time_tables/_form.html.slim
+++ b/app/views/time_tables/_form.html.slim
@@ -5,7 +5,7 @@
       = form.input :comment, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.time_table.comment")}
 
       - if @time_table.new_record? && !@time_table.created_from
-        = form.input :calendar_id, as: :select, input_html: { class: 'tt_target', style: "width: 100%", data: { 'select2-ajax': 'true', 'select2ed-placeholder': 'Indiquez un modèle de calendrier...', term: 'name_cont', url: autocomplete_calendars_path}}
+        = form.input :calendar_id, as: :select, input_html: { class: 'tt_target', style: "width: 100%", data: { 'select2-ajax': 'true', 'select2ed-placeholder': 'Indiquez un modèle de calendrier...', term: 'name_cont', url: autocomplete_workgroup_calendars_path(current_workgroup)}}
 
       - if @time_table.created_from
         = form.input :created_from, disabled: true, input_html: { value: @time_table.created_from.comment }