diff options
| author | Michel Etienne | 2013-06-17 11:43:57 +0200 |
|---|---|---|
| committer | Michel Etienne | 2013-06-17 11:43:57 +0200 |
| commit | 70fcdb424efd0478a384ef856775faec84cc2598 (patch) | |
| tree | 80371d010540258ff862353fbec56644e7cfb3ce /app | |
| parent | 41e2db123c923720b9f069668bc6ac9df53ce98c (diff) | |
| download | chouette-core-70fcdb424efd0478a384ef856775faec84cc2598.tar.bz2 | |
protect import/export view from invalid log messages
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/export_log_message.rb | 7 | ||||
| -rw-r--r-- | app/models/import_log_message.rb | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/models/export_log_message.rb b/app/models/export_log_message.rb index 8d6a09a6b..4bb9d3cc7 100644 --- a/app/models/export_log_message.rb +++ b/app/models/export_log_message.rb @@ -32,6 +32,11 @@ class ExportLogMessage < ActiveRecord::Base def full_message last_key=key.rpartition("|").last - I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "export_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + begin + I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "export_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + rescue => e + Rails.logger.error "missing arguments for message "+last_key + I18n.translate "WRONG_DATA",{"0"=>last_key}.symbolize_keys.merge(:scope => "export_log_messages.messages").merge(:default => :undefined).merge(:key => "WRONG_DATA") + end end end diff --git a/app/models/import_log_message.rb b/app/models/import_log_message.rb index ae331eb20..4b56f03bd 100644 --- a/app/models/import_log_message.rb +++ b/app/models/import_log_message.rb @@ -31,7 +31,12 @@ class ImportLogMessage < ActiveRecord::Base def full_message last_key=key.rpartition("|").last - I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + begin + I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + rescue => e + Rails.logger.error "missing arguments for message "+last_key + I18n.translate "WRONG_DATA",{"0"=>last_key}.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => "WRONG_DATA") + end end end |