DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Rename champ.zones to champ.geo_json

Browse source
This commit is contained in:
Paul Chavard 2018-10-31 13:27:56 +01:00
parent 2462e42b53
commit 18815e88a3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/champs/carte_champ.rb
View file

@ -43,7 +43,7 @@ class Champs::CarteChamp < Champ
end end
end end
def zones def geo_json
value.blank? ? [] : JSON.parse(value) @geo_json ||= value.blank? ? [] : JSON.parse(value)
end end
end end

6
app/views/shared/champs/carte/_geo_areas.html.haml
View file

@ -6,7 +6,7 @@
- elsif champ.value.blank? - elsif champ.value.blank?
Aucune zone tracée Aucune zone tracée
- elsif champ.quartiers_prioritaires.blank? - elsif champ.quartiers_prioritaires.blank?
= t('errors.messages.quartiers_prioritaires_empty', count: champ.zones.size) = t('errors.messages.quartiers_prioritaires_empty', count: champ.geo_json.size)
- else - else
%ul %ul
- champ.quartiers_prioritaires.each do |qp| - champ.quartiers_prioritaires.each do |qp|
@ -20,7 +20,7 @@
- elsif champ.value.blank? - elsif champ.value.blank?
Aucune zone tracée Aucune zone tracée
- elsif champ.cadastres.blank? - elsif champ.cadastres.blank?
= t('errors.messages.cadastres_empty', count: champ.zones.size) = t('errors.messages.cadastres_empty', count: champ.geo_json.size)
- else - else
%ul %ul
- champ.cadastres.each do |pc| - champ.cadastres.each do |pc|
@ -34,7 +34,7 @@
- elsif champ.value.blank? - elsif champ.value.blank?
Aucune zone tracée Aucune zone tracée
- elsif champ.parcelles_agricoles.blank? - elsif champ.parcelles_agricoles.blank?
= t('errors.messages.parcelles_agricoles_empty', count: champ.zones.size) = t('errors.messages.parcelles_agricoles_empty', count: champ.geo_json.size)
- else - else
%ul %ul
- champ.parcelles_agricoles.each do |pa| - champ.parcelles_agricoles.each do |pa|