diff options
| author | Xinhui | 2017-12-05 11:30:41 +0100 |
|---|---|---|
| committer | Xinhui | 2017-12-05 11:30:41 +0100 |
| commit | 8848d279b4d3a27c1ddebe7636a49abe545ba73a (patch) | |
| tree | bb42b7014a844f81161d4a03ecefbcda240f53ec | |
| parent | 782ecb332769bbe66b3aab4f17eccd96dcc85f92 (diff) | |
| download | chouette-core-8848d279b4d3a27c1ddebe7636a49abe545ba73a.tar.bz2 | |
Fix error 500 on time_table_combinations#new unable to find resource_class
Refs #5157
4 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/time_table_combinations_controller.rb b/app/controllers/time_table_combinations_controller.rb index 26cd425b3..317bc5518 100644 --- a/app/controllers/time_table_combinations_controller.rb +++ b/app/controllers/time_table_combinations_controller.rb @@ -1,5 +1,6 @@ class TimeTableCombinationsController < ChouetteController include ReferentialSupport + defaults :resource_class => TimeTableCombination belongs_to :referential do belongs_to :time_table, :parent_class => Chouette::TimeTable end diff --git a/app/views/time_table_combinations/new.html.slim b/app/views/time_table_combinations/new.html.slim index f18553081..7d2551311 100644 --- a/app/views/time_table_combinations/new.html.slim +++ b/app/views/time_table_combinations/new.html.slim @@ -1,4 +1,3 @@ - .page_content .container-fluid .row diff --git a/config/locales/time_table_combinations.en.yml b/config/locales/time_table_combinations.en.yml index 142270d13..6eae7b317 100644 --- a/config/locales/time_table_combinations.en.yml +++ b/config/locales/time_table_combinations.en.yml @@ -1,5 +1,7 @@ en: time_table_combinations: + new: + title: Combine a calendar success: "operation applied on timetable" failure: "operation failed on timetable" combined_type: diff --git a/config/locales/time_table_combinations.fr.yml b/config/locales/time_table_combinations.fr.yml index 5a23cf029..0430a382e 100644 --- a/config/locales/time_table_combinations.fr.yml +++ b/config/locales/time_table_combinations.fr.yml @@ -1,5 +1,7 @@ fr: time_table_combinations: + new: + title: Combiner un calendrier success: "opération appliquée sur le calendrier" failure: "opération échouée" combined_type: |