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

style check

Browse source
This commit is contained in:
Tanguy PATTE 2015-08-20 16:34:14 +02:00
parent b0d7e490d6
commit 5cc8c58e05
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/carte_controller.rb
View file

@ -11,7 +11,7 @@ class CarteController < ApplicationController
dossier = current_dossier dossier = current_dossier
if dossier.ref_dossier.blank? if dossier.ref_dossier.blank?
dossier.update_attributes(ref_dossier: params[:ref_dossier]) dossier.update_attributes(ref_dossier: params[:ref_dossier])
redirect_to url_for({controller: :description, action: :show, :dossier_id => params[:dossier_id]}) redirect_to url_for(controller: :description, action: :show, dossier_id: params[:dossier_id])
else else
commentaire_params = { commentaire_params = {
email: 'Modification localisation', email: 'Modification localisation',
@ -20,7 +20,7 @@ class CarteController < ApplicationController
} }
commentaire = Commentaire.new commentaire_params commentaire = Commentaire.new commentaire_params
commentaire.save commentaire.save
redirect_to url_for({controller: :recapitulatif, action: :show, :dossier_id => params[:dossier_id]}) redirect_to url_for(controller: :recapitulatif, action: :show, dossier_id: params[:dossier_id])
end end
end end
@ -28,10 +28,10 @@ class CarteController < ApplicationController
def get_position def get_position
dossier = current_dossier dossier = current_dossier
if dossier.position_lat == nil if dossier.position_lat.nil?
tmp_position = Carto::Geocodeur.convert_adresse_to_point(dossier.etablissement.adresse.gsub("\r\n", ' ')) tmp_position = Carto::Geocodeur.convert_adresse_to_point(dossier.etablissement.adresse.gsub("\r\n", ' '))
if tmp_position.point == nil if tmp_position.point.nil?
dossier.update_attributes(position_lat: '0', position_lon: '0') dossier.update_attributes(position_lat: '0', position_lon: '0')
else else
dossier.update_attributes(position_lat: tmp_position.point.y, position_lon: tmp_position.point.x) dossier.update_attributes(position_lat: tmp_position.point.y, position_lon: tmp_position.point.x)
@ -40,4 +40,4 @@ class CarteController < ApplicationController
render json: { lon: dossier.position_lon, lat: dossier.position_lat, dossier_id: params[:dossier_id] } render json: { lon: dossier.position_lon, lat: dossier.position_lat, dossier_id: params[:dossier_id] }
end end
end end