From 345b8929565716c92050ef616f751ed4316302f5 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 15 Jan 2018 19:14:09 +0100 Subject: [PATCH] Enable the Layout/LeadingCommentSpace cop --- .rubocop.yml | 2 +- app/controllers/admin/gestionnaires_controller.rb | 2 +- app/controllers/users/sessions_controller.rb | 2 +- app/facades/dossier_facades.rb | 2 +- app/facades/invite_dossier_facades.rb | 2 +- app/models/etablissement.rb | 2 +- app/models/gestionnaire.rb | 2 +- app/models/search.rb | 10 +++++----- config/routes.rb | 2 +- ...0609145737_delete_default_description_to_dossier.rb | 8 ++++---- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 069eda4ae..10af7eb1a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -121,7 +121,7 @@ Layout/InitialIndentation: Enabled: true Layout/LeadingCommentSpace: - Enabled: false + Enabled: true Layout/MultilineArrayBraceLayout: Enabled: false diff --git a/app/controllers/admin/gestionnaires_controller.rb b/app/controllers/admin/gestionnaires_controller.rb index 6319e2569..e8f1848f3 100644 --- a/app/controllers/admin/gestionnaires_controller.rb +++ b/app/controllers/admin/gestionnaires_controller.rb @@ -61,7 +61,7 @@ class Admin::GestionnairesController < AdminController else @gestionnaire.administrateurs.push current_administrateur flash.notice = 'Accompagnateur ajouté' - #TODO Mailer no assign_to + # TODO Mailer no assign_to end end end diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index ea455dbfc..df00724b4 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -12,7 +12,7 @@ class Users::SessionsController < Sessions::SessionsController error_procedure end - #POST /resource/sign_in + # POST /resource/sign_in def create remember_me = params[:user][:remember_me] == '1' try_to_authenticate(User, remember_me) diff --git a/app/facades/dossier_facades.rb b/app/facades/dossier_facades.rb index 160d5e3b5..f41ebd9e8 100644 --- a/app/facades/dossier_facades.rb +++ b/app/facades/dossier_facades.rb @@ -1,5 +1,5 @@ class DossierFacades - #TODO rechercher en fonction de la personne/email + # TODO rechercher en fonction de la personne/email def initialize(dossier_id, email, champ_id = nil) @dossier = Dossier.find(dossier_id) @champ_id = champ_id diff --git a/app/facades/invite_dossier_facades.rb b/app/facades/invite_dossier_facades.rb index 6aaad2450..895e6a684 100644 --- a/app/facades/invite_dossier_facades.rb +++ b/app/facades/invite_dossier_facades.rb @@ -1,5 +1,5 @@ class InviteDossierFacades < DossierFacades - #TODO rechercher en fonction de la personne/email + # TODO rechercher en fonction de la personne/email def initialize id, email @dossier = Invite.where(email: email, id: id).first!.dossier end diff --git a/app/models/etablissement.rb b/app/models/etablissement.rb index 5e480ae85..23fc3b0c0 100644 --- a/app/models/etablissement.rb +++ b/app/models/etablissement.rb @@ -11,7 +11,7 @@ class Etablissement < ActiveRecord::Base end def inline_adresse - #squeeze needed because of space in excess in the data + # squeeze needed because of space in excess in the data "#{numero_voie} #{type_voie} #{nom_voie}, #{complement_adresse}, #{code_postal} #{localite}".squeeze(' ') end end diff --git a/app/models/gestionnaire.rb b/app/models/gestionnaire.rb index b3655b169..a7ab7f1ea 100644 --- a/app/models/gestionnaire.rb +++ b/app/models/gestionnaire.rb @@ -107,7 +107,7 @@ class Gestionnaire < ActiveRecord::Base .find_by(gestionnaire: self, dossier: dossier) if follow.present? - #retirer le seen_at.present? une fois la contrainte de presence en base (et les migrations ad hoc) + # retirer le seen_at.present? une fois la contrainte de presence en base (et les migrations ad hoc) champs_publiques = follow.demande_seen_at.present? && follow.dossier.champs.updated_since?(follow.demande_seen_at).any? diff --git a/app/models/search.rb b/app/models/search.rb index 89f01ea03..7e455f4a8 100644 --- a/app/models/search.rb +++ b/app/models/search.rb @@ -65,11 +65,11 @@ class Search < ActiveRecord::Base Results.new(q) end - #def self.refresh - # # TODO: could be executed concurrently - # # See https://github.com/thoughtbot/scenic#what-about-materialized-views - # Scenic.database.refresh_materialized_view(table_name, concurrently: false) - #end + # def self.refresh + # # TODO: could be executed concurrently + # # See https://github.com/thoughtbot/scenic#what-about-materialized-views + # Scenic.database.refresh_materialized_view(table_name, concurrently: false) + # end private diff --git a/config/routes.rb b/config/routes.rb index eedcd3e86..6f58fe1b3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -171,7 +171,7 @@ Rails.application.routes.draw do end namespace :accompagnateurs do - get 'show' #delete after fixed tests admin/accompagnateurs/show_spec without this line + get 'show' # delete after fixed tests admin/accompagnateurs/show_spec without this line end resources :gestionnaires, only: [:index, :create, :destroy] diff --git a/db/migrate/20160609145737_delete_default_description_to_dossier.rb b/db/migrate/20160609145737_delete_default_description_to_dossier.rb index 8ba2fc7d9..feca43f92 100644 --- a/db/migrate/20160609145737_delete_default_description_to_dossier.rb +++ b/db/migrate/20160609145737_delete_default_description_to_dossier.rb @@ -13,21 +13,21 @@ class DeleteDefaultDescriptionToDossier < ActiveRecord::Migration def up Procedure.all.each do |procedure| - #change all type_de_champ place_order by +1 to insert new type_de_champ description on first place + # change all type_de_champ place_order by +1 to insert new type_de_champ description on first place TypeDeChamp.where(procedure_id: procedure.id).each do |type_de_champ| type_de_champ.order_place += 1 type_de_champ.save end - #insert type_de_champ description on first place + # insert type_de_champ description on first place TypeDeChamp.create(libelle: 'Description', description: 'Description de votre demande', type_champ: 'textarea', order_place: 0, procedure_id: procedure.id, mandatory: true) end Dossier.all.each do |dossier| - #get the new type de champ + # get the new type de champ new_type_de_champ = TypeDeChamp.where(libelle: 'Description', type_champ: 'textarea', order_place: 0, procedure_id: dossier.procedure_id, mandatory: true) - #create a new champ with the actual description value + # create a new champ with the actual description value Champ.create(value: dossier.description, type_de_champ_id: new_type_de_champ.first.id, dossier_id: dossier.id) end