diff options
| author | Luc Donnet | 2017-08-30 22:07:43 +0200 |
|---|---|---|
| committer | Luc Donnet | 2017-08-30 22:07:43 +0200 |
| commit | 26c4b71042d258da2fc9ccd67855219b9b012c6b (patch) | |
| tree | 21b63dbc94f60a955f8a51db2628984e12bd4f1a /app | |
| parent | 4d28e063f7071501eef61b59cf8a90730760c523 (diff) | |
| parent | 637defea87489a4f969766e638d190facd54009a (diff) | |
| download | chouette-core-26c4b71042d258da2fc9ccd67855219b9b012c6b.tar.bz2 | |
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'app')
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js index 0d8e54b1e..5157300ba 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js @@ -36,7 +36,7 @@ class BSelect4 extends React.Component{ let newParmas = params.term.split(" ") return { q: { - objectid_end_any: newParmas, + objectid_cont_any: newParmas, comment_cont_any: newParmas, m: 'or' } diff --git a/app/models/import.rb b/app/models/import.rb index 5f83ed255..9daff0494 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -33,11 +33,11 @@ class Import < ActiveRecord::Base end def notify_parent - parent.child_change(self) + parent.child_change update(notified_parent_at: DateTime.now) end - def child_change(child) + def child_change return if self.class.finished_statuses.include?(status) update_status diff --git a/app/views/time_table_combinations/_form.html.slim b/app/views/time_table_combinations/_form.html.slim index 581f00457..8e2d77d46 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, :source_id => @combination.source_id)}}, 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_cont_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' : ''} |