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

Don’t use unless

Browse source
This commit is contained in:
gregoirenovel 2018-01-11 19:04:39 +01:00
parent 8c73851cec
commit 7c34807f46
90 changed files with 164 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/change_dossier_state_controller.rb
View file

@ -11,7 +11,7 @@ class Admin::ChangeDossierStateController < AdminController
def check
@dossier = Dossier.find(params[:dossier][:id])
unless @dossier.procedure.administrateur.email == current_administrateur.email
if @dossier.procedure.administrateur.email != current_administrateur.email
flash.alert = 'Dossier introuvable'
return redirect_to admin_change_dossier_state_path
end

4
app/controllers/admin/procedures_controller.rb
View file

@ -71,7 +71,7 @@ class Admin::ProceduresController < AdminController
@procedure = Procedure.new(procedure_params)
@procedure.module_api_carto = ModuleAPICarto.new(create_module_api_carto_params) if @procedure.valid?
unless @procedure.save
if !@procedure.save
flash.now.alert = @procedure.errors.full_messages
return render 'new'
end
@ -83,7 +83,7 @@ class Admin::ProceduresController < AdminController
def update
@procedure = current_administrateur.procedures.find(params[:id])
unless @procedure.update_attributes(procedure_params)
if !@procedure.update_attributes(procedure_params)
flash.now.alert = @procedure.errors.full_messages
return render 'edit'
end

4
app/controllers/api_controller.rb
View file

@ -3,7 +3,7 @@ class APIController < ApplicationController
before_action :default_format_json
def authenticate_user
render json: {}, status: 401 unless valid_token?
render json: {}, status: 401 if !valid_token?
end
protected
@ -17,6 +17,6 @@ class APIController < ApplicationController
end
def default_format_json
request.format = "json" unless request.params[:format]
request.format = "json" if !request.params[:format]
end
end

8
app/controllers/backoffice/dossiers_controller.rb
View file

@ -29,7 +29,7 @@ class Backoffice::DossiersController < Backoffice::DossiersListController
dossier_id = params[:id]
create_dossier_facade dossier_id
unless @facade.nil?
if @facade.present?
@champs_private = @facade.champs_private
@headers_private = @champs_private.select { |champ| champ.type_champ == 'header_section' }
@ -72,7 +72,7 @@ class Backoffice::DossiersController < Backoffice::DossiersListController
@dossiers = Dossier.none if @dossiers.nil?
# full text search
unless @dossiers.any?
if !@dossiers.any?
@dossiers = Search.new(
gestionnaire: current_gestionnaire,
query: @search_terms,
@ -161,7 +161,7 @@ class Backoffice::DossiersController < Backoffice::DossiersListController
def archive
facade = create_dossier_facade params[:id]
unless facade.dossier.archived
if !facade.dossier.archived
facade.dossier.update(archived: true)
flash.notice = 'Dossier archivé'
end
@ -205,7 +205,7 @@ class Backoffice::DossiersController < Backoffice::DossiersListController
end
def ensure_gestionnaire_is_authorized
unless current_gestionnaire.can_view_dossier?(params[:id])
if !current_gestionnaire.can_view_dossier?(params[:id])
flash.alert = t('errors.messages.dossier_not_found')
redirect_to url_for(controller: '/backoffice')
end

8
app/controllers/backoffice/dossiers_list_controller.rb
View file

@ -7,12 +7,12 @@ class Backoffice::DossiersListController < ApplicationController
def index
cookies[:liste] = param_liste
unless DossiersListGestionnaireService.dossiers_liste_libelle.include?(param_liste)
if !DossiersListGestionnaireService.dossiers_liste_libelle.include?(param_liste)
cookies[:liste] = 'all_state'
end
dossiers_list_facade param_liste
dossiers_list_facade.service.change_sort! param_sort unless param_smart_listing.nil?
dossiers_list_facade.service.change_sort! param_sort if param_smart_listing.present?
dossiers_list_facade.service.change_page! param_page
smartlisting_dossier
@ -58,14 +58,14 @@ class Backoffice::DossiersListController < ApplicationController
end
def param_page
unless param_smart_listing.nil?
if param_smart_listing.present?
return 1 if params[:dossiers_smart_listing][:page].blank?
params[:dossiers_smart_listing][:page]
end
end
def param_sort
params[:dossiers_smart_listing][:sort] unless param_smart_listing.nil?
params[:dossiers_smart_listing][:sort] if param_smart_listing.present?
end
def param_filter

2
app/controllers/backoffice/private_formulaires_controller.rb
View file

@ -4,7 +4,7 @@ class Backoffice::PrivateFormulairesController < ApplicationController
def update
dossier = current_gestionnaire.dossiers.find(params[:dossier_id])
unless params[:champs].nil?
if params[:champs].present?
ChampsService.save_champs dossier.champs_private, params
champs_service_errors = ChampsService.build_error_messages(dossier.champs_private)

2
app/controllers/ban/search_controller.rb
View file

@ -10,7 +10,7 @@ class Ban::SearchController < ApplicationController
def get_address_point
point = Carto::Geocodeur.convert_adresse_to_point(params[:request])
unless point.nil?
if point.present?
lon = point.x.to_s
lat = point.y.to_s
end

12
app/controllers/france_connect/particulier_controller.rb
View file

@ -14,11 +14,11 @@ class FranceConnect::ParticulierController < ApplicationController
end
def callback
return redirect_to new_user_session_path unless params.has_key?(:code)
return redirect_to new_user_session_path if !params.has_key?(:code)
user_infos = FranceConnectService.retrieve_user_informations_particulier(params[:code])
unless user_infos.nil?
if user_infos.present?
france_connect_information = FranceConnectInformation.find_by_france_connect_particulier user_infos
france_connect_information = FranceConnectInformation.create(
@ -44,7 +44,7 @@ class FranceConnect::ParticulierController < ApplicationController
end
def new
return redirect_france_connect_error_connection unless valid_salt_and_fci_id_params?
return redirect_france_connect_error_connection if !valid_salt_and_fci_id_params?
france_connect_information = FranceConnectInformation.find(params[:fci_id])
@user = User.new(france_connect_information: france_connect_information).decorate
@ -53,13 +53,13 @@ class FranceConnect::ParticulierController < ApplicationController
end
def check_email
return redirect_france_connect_error_connection unless valid_salt_and_fci_id_params?
return redirect_france_connect_error_connection if !valid_salt_and_fci_id_params?
user = User.find_by_email(params[:user][:email_france_connect])
return create if user.nil?
unless params[:user][:password].nil?
if params[:user][:password].present?
if user.valid_password?(params[:user][:password])
user.france_connect_information = FranceConnectInformation.find(params[:fci_id])
@ -80,7 +80,7 @@ class FranceConnect::ParticulierController < ApplicationController
user = User.new email: params[:user][:email_france_connect]
user.password = Devise.friendly_token[0, 20]
unless user.valid?
if !user.valid?
flash.alert = 'Email non valide'
return redirect_to france_connect_particulier_new_path fci_id: params[:fci_id], salt: params[:salt], user: {email_france_connect: params[:user]['email_france_connect']}

11
app/controllers/invites_controller.rb
View file

@ -13,8 +13,11 @@ class InvitesController < ApplicationController
invite = class_var.create(dossier: dossier, user: user, email: email, email_sender: email_sender)
if invite.valid?
InviteMailer.invite_user(invite).deliver_now! unless invite.user.nil?
InviteMailer.invite_guest(invite).deliver_now! if invite.user.nil?
if invite.user.present?
InviteMailer.invite_user(invite).deliver_now!
else
InviteMailer.invite_guest(invite).deliver_now!
end
flash.notice = "Invitation envoyée (#{invite.email})"
else
@ -31,7 +34,9 @@ class InvitesController < ApplicationController
private
def gestionnaire_or_user?
return redirect_to root_path unless user_signed_in? || gestionnaire_signed_in?
if !user_signed_in? && !gestionnaire_signed_in?
return redirect_to root_path
end
@current_devise_profil = current_user if user_signed_in?
@current_devise_profil = current_gestionnaire if gestionnaire_signed_in?

4
app/controllers/new_gestionnaire/dossiers_controller.rb
View file

@ -136,13 +136,13 @@ module NewGestionnaire
def position
etablissement = dossier.etablissement
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

6
app/controllers/users/carte_controller.rb
View file

@ -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

10
app/controllers/users/description_controller.rb
View file

@ -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

4
app/controllers/users/dossiers/add_siret_controller.rb
View file

@ -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')

10
app/controllers/users/dossiers_controller.rb
View file

@ -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

2
app/controllers/users/sessions_controller.rb
View file

@ -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

2
app/controllers/users_controller.rb
View file

@ -16,7 +16,7 @@ class UsersController < ApplicationController
end
def authorized_routes? controller
redirect_to_root_path 'Le statut de votre dossier n\'autorise pas cette URL' unless UserRoutesAuthorizationService.authorized_route?(
redirect_to_root_path 'Le statut de votre dossier n\'autorise pas cette URL' if !UserRoutesAuthorizationService.authorized_route?(
controller,
current_user_dossier)
rescue ActiveRecord::RecordNotFound