aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorMichel Etienne2014-10-01 17:07:33 +0200
committerMichel Etienne2014-10-01 17:07:33 +0200
commitad37841236153979c9d2ad82c613c2b69c4ffbb6 (patch)
tree787f87e990cd1a68627f6360266ec18ea2ef5ea2 /app/controllers
parent94e2f80aa99843c21e290ce75a7f8912f3368f3f (diff)
downloadchouette-core-ad37841236153979c9d2ad82c613c2b69c4ffbb6.tar.bz2
time table combination , Mantis 29109
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/time_table_combinations_controller.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/time_table_combinations_controller.rb b/app/controllers/time_table_combinations_controller.rb
index 32a3dcab9..ebae9f225 100644
--- a/app/controllers/time_table_combinations_controller.rb
+++ b/app/controllers/time_table_combinations_controller.rb
@@ -19,16 +19,18 @@ class TimeTableCombinationsController < ChouetteController
def create
+ Rails.logger.warn( params.inspect)
@time_table_combination = TimeTableCombination.new( params[:time_table_combination].merge( :source_id => parent.id))
+ Rails.logger.warn( @time_table_combination.inspect)
@year = params[:year] ? params[:year].to_i : Date.today.cwyear
if @time_table_combination.valid?
begin
@time_table = @time_table_combination.combine
flash[:notice] = t('time_table_combinations.success')
render "create_success"
- rescue => e
- Rails.logger.error( "TimeTableCombination error, @time_table_combination=#{@time_table_combination.inspect}")
- Rails.logger.error( e.inspect)
+ rescue => e
+ Rails.logger.error( "TimeTableCombination error, @time_table_combination=#{@time_table_combination.inspect}")
+ Rails.logger.error( e.inspect)
flash[:error] = t('time_table_combinations.failure')
render "create_failure"
end