diff options
| author | Michel Etienne | 2012-09-13 17:13:22 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-09-13 17:13:22 +0200 |
| commit | ef09261e000ff60c5cd37859d7483530f73f463b (patch) | |
| tree | 97510fdadefe2b70315daf62ccb820b547dd391d /app | |
| parent | b481d549164a4c69dd5869f74de76c31c2a632dc (diff) | |
| download | chouette-core-ef09261e000ff60c5cd37859d7483530f73f463b.tar.bz2 | |
refactor test 1.2
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/file_validations.css.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/routes.css.scss | 2 | ||||
| -rw-r--r-- | app/models/file_validation.rb | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/stylesheets/file_validations.css.scss b/app/assets/stylesheets/file_validations.css.scss index 250561177..187c74b3c 100644 --- a/app/assets/stylesheets/file_validations.css.scss +++ b/app/assets/stylesheets/file_validations.css.scss @@ -99,7 +99,8 @@ } } -#workspace.file_validations.new #workspace.file_validations.create { +#workspace.file_validations.new, #workspace.file_validations.create +{ padding: 0; margin-top: -0.3em; margin-bottom: 1em; diff --git a/app/assets/stylesheets/routes.css.scss b/app/assets/stylesheets/routes.css.scss index bbf2576b3..756ddadfa 100644 --- a/app/assets/stylesheets/routes.css.scss +++ b/app/assets/stylesheets/routes.css.scss @@ -41,7 +41,7 @@ } } -#workspace.routes.edit, #workspace.routes.new, #workspace.routes.create,, #workspace.routes.update +#workspace.routes.edit, #workspace.routes.new, #workspace.routes.create, #workspace.routes.update { #route_color{ width: 100px; color: white; diff --git a/app/models/file_validation.rb b/app/models/file_validation.rb index a4c76ebf0..e09a48113 100644 --- a/app/models/file_validation.rb +++ b/app/models/file_validation.rb @@ -74,9 +74,11 @@ class FileValidation < ActiveRecord::Base after_validation :extract_file_type, :on => :create def extract_file_type - if !resources.original_filename.nil? - self.file_type = resources.original_filename.rpartition(".").last - self.file_name = resources.original_filename + if ! resources.nil? + if !resources.original_filename.nil? + self.file_type = resources.original_filename.rpartition(".").last + self.file_name = resources.original_filename + end end end |