aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/time_table_combinations
diff options
context:
space:
mode:
authorcedricnjanga2017-08-21 14:09:13 +0200
committercedricnjanga2017-08-21 17:34:04 +0200
commitcb6536cb9d3911d6c66fa98899b3e36a93b1ed06 (patch)
treead70ea81ebefc4871bfb9443c3479352a2dc63a0 /app/views/time_table_combinations
parent25d8bd65e984bdb447e6e9b25dafd30070ef029d (diff)
downloadchouette-core-cb6536cb9d3911d6c66fa98899b3e36a93b1ed06.tar.bz2
Refs #4246 Fix combinaitions to only consider effective days for the two tt
Diffstat (limited to 'app/views/time_table_combinations')
-rw-r--r--app/views/time_table_combinations/_form.html.slim2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/time_table_combinations/_form.html.slim b/app/views/time_table_combinations/_form.html.slim
index b4f818828..581f00457 100644
--- a/app/views/time_table_combinations/_form.html.slim
+++ b/app/views/time_table_combinations/_form.html.slim
@@ -7,7 +7,7 @@
abbr title='Champ requis' *
= f.input :combined_type, as: :boolean, checked_value: 'time_table', unchecked_value: 'calendar', required: false, label: content_tag(:span, t("time_table_combinations.combined_type.#{@combination.combined_type}"), class: 'switch-label', data: { checkedValue: 'Calendriers', uncheckedValue: 'Modèles de calendriers' }), wrapper_html: { class: 'col-sm-8 col-xs-7' }
- = f.input :time_table_id, as: :select, input_html: {class: 'tt_combination_target', style: "width: 100%", data: { 'select2-ajax': 'true', 'select2ed-placeholder': 'Indiquez un calendrier...', term: 'comment_or_objectid_cont', url: referential_autocomplete_time_tables_path(@referential, format: :json)}}, wrapper_html: {class: @combination.combined_type != 'time_table' ? 'hidden' : ''}
+ = f.input :time_table_id, as: :select, input_html: {class: 'tt_combination_target', style: "width: 100%", data: { 'select2-ajax': 'true', 'select2ed-placeholder': 'Indiquez un calendrier...', term: 'comment_or_objectid_cont', url: referential_autocomplete_time_tables_path(@referential, format: :json, :source_id => @combination.source_id)}}, wrapper_html: {class: @combination.combined_type != 'time_table' ? 'hidden' : ''}
= f.input :calendar_id, as: :select, input_html: { class: 'tt_combination_target', style: "width: 100%", data: { 'select2-ajax': 'true', 'select2ed-placeholder': 'Indiquez un modèle de calendrier...', term: 'name_cont', url: autocomplete_calendars_path}}, wrapper_html: {class: @combination.combined_type != 'calendar' ? 'hidden' : ''}