diff options
| author | Michel Etienne | 2014-08-13 11:16:54 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-08-13 11:16:54 +0200 |
| commit | 8157af57a17b75eb4e710de940b8fe15244bf561 (patch) | |
| tree | e922ef50a87d8fab380e80c9b17d1f1f6d621bb5 /app/controllers | |
| parent | f6b44e1f7745ae7bd4aa775564478f876d14229c (diff) | |
| download | chouette-core-8157af57a17b75eb4e710de940b8fe15244bf561.tar.bz2 | |
use font awesome icon for duplicate and combine actions
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/time_table_combinations_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/time_table_combinations_controller.rb b/app/controllers/time_table_combinations_controller.rb index 249bb5060..2af3fe630 100644 --- a/app/controllers/time_table_combinations_controller.rb +++ b/app/controllers/time_table_combinations_controller.rb @@ -8,13 +8,13 @@ class TimeTableCombinationsController < ChouetteController def create combination = TimeTableCombination.new( params[:time_table_combination].merge( :source_id => parent.id)) if combination.invalid? - flash[:alert] = combination.errors.full_messages.join("<br/>") + flash[:error] = combination.errors.full_messages.join("<br/>") else begin combination.combine flash[:notice] = t('time_table_combinations.success') rescue - flash[:alert] = t('time_table_combinations.failure') + flash[:error] = t('time_table_combinations.failure') end end redirect_to referential_time_table_path(@referential, @time_table) |
