aboutsummaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorLuc Donnet2016-11-03 11:02:28 +0100
committerLuc Donnet2016-11-03 11:02:28 +0100
commit552611c5a96134eff8515bbfe32870e900225bfb (patch)
treec3b7cc795d60d390457d201feb7cb845f4b433dd /app/views
parent7212356ab15ea1807c28a8dce4a11290d47facac (diff)
parentd67ed4c32b338070e4e4ff33f89fe64011e14c3b (diff)
downloadchouette-core-552611c5a96134eff8515bbfe32870e900225bfb.tar.bz2
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'app/views')
-rw-r--r--app/views/referentials/_form.html.slim4
-rw-r--r--app/views/workbenches/_referential.html.slim (renamed from app/views/offer_workbenches/_referential.html.slim)0
-rw-r--r--app/views/workbenches/show.html.slim (renamed from app/views/offer_workbenches/show.html.slim)0
3 files changed, 3 insertions, 1 deletions
diff --git a/app/views/referentials/_form.html.slim b/app/views/referentials/_form.html.slim
index dd426f426..ce53c2ede 100644
--- a/app/views/referentials/_form.html.slim
+++ b/app/views/referentials/_form.html.slim
@@ -15,8 +15,10 @@
= form.input :upper_corner, input_html: { title: t("formtastic.titles.referential.upper_corner") }
= form.input :lower_corner, input_html: { title: t("formtastic.titles.referential.lower_corner") }
= form.input :data_format, label: true, include_blank: false
+ - if @referential.created_from
+ = form.input :created_from
- = form.inputs for: [:referential_metadata, @referential.referential_metadata] do |meta|
+ = form.inputs for: [:referential_metadatas, @referential.referential_metadatas] do |meta|
= meta.inputs :referential_source
= form.actions do
diff --git a/app/views/offer_workbenches/_referential.html.slim b/app/views/workbenches/_referential.html.slim
index cc1964f30..cc1964f30 100644
--- a/app/views/offer_workbenches/_referential.html.slim
+++ b/app/views/workbenches/_referential.html.slim
diff --git a/app/views/offer_workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index 49396a0e2..49396a0e2 100644
--- a/app/views/offer_workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim