aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-04-25 09:46:20 +0200
committerJohan Van Ryseghem2018-04-25 15:46:33 +0200
commit91f253454d261767b9a9c9d5a328b3c6d149cee9 (patch)
treebda750bf954fe9f915935bb785ac4c3ce3b2ad22
parente36e3703c91c98f9d872cab057b1cd993d8b0a27 (diff)
downloadchouette-core-91f253454d261767b9a9c9d5a328b3c6d149cee9.tar.bz2
Unify custom_fields codes in StopArea/Company forms. Refs #6669
-rw-r--r--app/views/companies/_form.html.slim2
-rw-r--r--app/views/stop_areas/_form.html.slim4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/companies/_form.html.slim b/app/views/companies/_form.html.slim
index e8b3fcede..ec003b836 100644
--- a/app/views/companies/_form.html.slim
+++ b/app/views/companies/_form.html.slim
@@ -12,7 +12,7 @@
= f.input :time_zone, include_blank: true
= f.input :url
= f.input :registration_number, :input_html => {:title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.company.registration_number")}
- - if resource.custom_fields(current_referential.workgroup).any?
+ - if resource.custom_fields.present?
- resource.custom_fields.each do |code, field|
= field.input(f).to_s
.separator
diff --git a/app/views/stop_areas/_form.html.slim b/app/views/stop_areas/_form.html.slim
index 00f2ad8bb..220097a69 100644
--- a/app/views/stop_areas/_form.html.slim
+++ b/app/views/stop_areas/_form.html.slim
@@ -62,10 +62,10 @@
= f.input :stairs_availability, as: :select, :collection => [[t("true"), true], [t("false"), false]], :include_blank => true
= f.input :lift_availability, as: :select, :collection => [[t("true"), true], [t("false"), false]], :include_blank => true
- - if resource.custom_fields(resource.stop_area_referential.workgroup).any?
+ - if resource.custom_fields.present?
.custom_fields
h3 = t("stop_areas.stop_area.custom_fields")
- - resource.custom_fields(resource.stop_area_referential.workgroup).each do |code, field|
+ - resource.custom_fields.each do |code, field|
= field.input(f).to_s
.separator