Don’t use unless
This commit is contained in:
parent
8c73851cec
commit
7c34807f46
90 changed files with 164 additions and 157 deletions
|
@ -17,7 +17,7 @@ class Users::CarteController < UsersController
|
|||
dossier.quartier_prioritaires.each(&:destroy)
|
||||
dossier.cadastres.each(&:destroy)
|
||||
|
||||
unless params[:json_latlngs].blank?
|
||||
if params[:json_latlngs].present?
|
||||
ModuleApiCartoService.save_qp! dossier, params[:json_latlngs]
|
||||
ModuleApiCartoService.save_cadastre! dossier, params[:json_latlngs]
|
||||
end
|
||||
|
@ -37,13 +37,13 @@ class Users::CarteController < UsersController
|
|||
etablissement = nil
|
||||
end
|
||||
|
||||
point = Carto::Geocodeur.convert_adresse_to_point(etablissement.geo_adresse) unless etablissement.nil?
|
||||
point = Carto::Geocodeur.convert_adresse_to_point(etablissement.geo_adresse) if etablissement.present?
|
||||
|
||||
lon = '2.428462'
|
||||
lat = '46.538192'
|
||||
zoom = '13'
|
||||
|
||||
unless point.nil?
|
||||
if point.present?
|
||||
lon = point.x.to_s
|
||||
lat = point.y.to_s
|
||||
end
|
||||
|
|
|
@ -14,7 +14,7 @@ class Users::DescriptionController < UsersController
|
|||
|
||||
@headers = @champs.select { |c| c.type_champ == 'header_section' }
|
||||
|
||||
unless @dossier.can_be_en_construction?
|
||||
if !@dossier.can_be_en_construction?
|
||||
flash[:alert] = t('errors.messages.procedure_archived')
|
||||
end
|
||||
|
||||
|
@ -27,13 +27,13 @@ class Users::DescriptionController < UsersController
|
|||
dossier = current_user_dossier
|
||||
procedure = dossier.procedure
|
||||
|
||||
return head :forbidden unless dossier.can_be_en_construction?
|
||||
return head :forbidden if !dossier.can_be_en_construction?
|
||||
|
||||
ChampsService.save_champs(dossier.champs, params) if params[:champs]
|
||||
|
||||
if procedure.cerfa_flag? && params[:cerfa_pdf]
|
||||
cerfa = Cerfa.new(content: params[:cerfa_pdf], dossier: dossier, user: current_user)
|
||||
return redirect_to_description_with_errors(dossier, cerfa.errors.full_messages) unless cerfa.save
|
||||
return redirect_to_description_with_errors(dossier, cerfa.errors.full_messages) if !cerfa.save
|
||||
end
|
||||
|
||||
errors_upload = PiecesJustificativesService.upload!(dossier, current_user, params)
|
||||
|
@ -69,9 +69,9 @@ class Users::DescriptionController < UsersController
|
|||
@dossier ||= current_user_dossier
|
||||
|
||||
if @dossier.procedure.cerfa_flag?
|
||||
unless params[:cerfa_pdf].nil?
|
||||
if params[:cerfa_pdf].present?
|
||||
cerfa = Cerfa.new(content: params[:cerfa_pdf], dossier: @dossier, user: current_user)
|
||||
unless cerfa.save
|
||||
if !cerfa.save
|
||||
flash.alert = cerfa.errors.full_messages
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,9 +2,9 @@ class Users::Dossiers::AddSiretController < ApplicationController
|
|||
def show
|
||||
@facade = DossierFacades.new params[:dossier_id], current_user.email
|
||||
|
||||
raise ActiveRecord::RecordNotFound unless @facade.procedure.individual_with_siret?
|
||||
raise ActiveRecord::RecordNotFound if !@facade.procedure.individual_with_siret?
|
||||
|
||||
@siret = current_user.siret unless current_user.siret.nil?
|
||||
@siret = current_user.siret if current_user.siret.present?
|
||||
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
flash.alert = t('errors.messages.dossier_not_found')
|
||||
|
|
|
@ -36,7 +36,7 @@ class Users::DossiersController < UsersController
|
|||
end
|
||||
|
||||
def commencer
|
||||
unless params[:procedure_path].nil?
|
||||
if params[:procedure_path].present?
|
||||
procedure_path = ProcedurePath.where(path: params[:procedure_path]).last
|
||||
|
||||
if procedure_path.nil? || procedure_path.procedure.nil?
|
||||
|
@ -65,7 +65,7 @@ class Users::DossiersController < UsersController
|
|||
dossier = Dossier.create(procedure: procedure, user: current_user, state: 'brouillon')
|
||||
siret = params[:siret] || current_user.siret
|
||||
|
||||
update_current_user_siret! siret unless siret.nil?
|
||||
update_current_user_siret! siret if siret.present?
|
||||
|
||||
redirect_to users_dossier_path(id: dossier.id)
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
|
@ -74,7 +74,7 @@ class Users::DossiersController < UsersController
|
|||
|
||||
def show
|
||||
@facade = facade
|
||||
@siret = current_user.siret unless current_user.siret.nil?
|
||||
@siret = current_user.siret if current_user.siret.present?
|
||||
|
||||
if @facade.procedure.for_individual? && current_user.loged_in_with_france_connect?
|
||||
individual = @facade.dossier.individual
|
||||
|
@ -135,7 +135,7 @@ class Users::DossiersController < UsersController
|
|||
flash.alert = individual_errors
|
||||
redirect_to users_dossier_path(id: @facade.dossier.id)
|
||||
else
|
||||
unless Dossier.find(@facade.dossier.id).update_attributes update_params_with_formatted_birthdate
|
||||
if !Dossier.find(@facade.dossier.id).update_attributes update_params_with_formatted_birthdate
|
||||
flash.alert = @facade.dossier.errors.full_messages
|
||||
|
||||
return redirect_to users_dossier_path(id: @facade.dossier.id)
|
||||
|
@ -174,7 +174,7 @@ class Users::DossiersController < UsersController
|
|||
private
|
||||
|
||||
def check_siret
|
||||
errors_valid_siret unless Siret.new(siret: siret).valid?
|
||||
errors_valid_siret if !Siret.new(siret: siret).valid?
|
||||
end
|
||||
|
||||
def errors_valid_siret
|
||||
|
|
|
@ -3,7 +3,7 @@ class Users::SessionsController < Sessions::SessionsController
|
|||
|
||||
# GET /resource/sign_in
|
||||
def new
|
||||
unless user_return_to_procedure_id.nil? # WTF ?
|
||||
if user_return_to_procedure_id.present? # WTF ?
|
||||
@dossier = Dossier.new(procedure: Procedure.active(user_return_to_procedure_id))
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue