diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/autocomplete_calendars_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/time_table_combinations_controller.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/autocomplete_calendars_controller.rb b/app/controllers/autocomplete_calendars_controller.rb index dbdd1a9fc..f85f529fc 100644 --- a/app/controllers/autocomplete_calendars_controller.rb +++ b/app/controllers/autocomplete_calendars_controller.rb @@ -2,6 +2,6 @@ class AutocompleteCalendarsController < ApplicationController respond_to :json, :only => [:autocomplete] def autocomplete - @calendars = Calendar.search(params[:q]).result.paginate(page: params[:page]) + @calendars = current_organisation.referentials.search(params[:q]).result.paginate(page: params[:page]) end end diff --git a/app/controllers/time_table_combinations_controller.rb b/app/controllers/time_table_combinations_controller.rb index bbb262247..32f1818b0 100644 --- a/app/controllers/time_table_combinations_controller.rb +++ b/app/controllers/time_table_combinations_controller.rb @@ -5,6 +5,7 @@ class TimeTableCombinationsController < ChouetteController def new @combination = TimeTableCombination.new(source_id: parent.id) + @combination.combined_type = 'time_table' end def create |