Skip to content

Commit

Permalink
clean DS useless code differences
Browse files Browse the repository at this point in the history
  • Loading branch information
maatinito committed Jul 16, 2024
1 parent 9284f67 commit 1e0125c
Show file tree
Hide file tree
Showing 18 changed files with 16 additions and 74 deletions.
1 change: 0 additions & 1 deletion app/controllers/instructeurs/dossiers_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ def messagerie

def annotations_privees
@annotations_privees_seen_at = current_instructeur.follows.find_by(dossier: dossier)&.annotations_privees_seen_at
@display_news = Date.today < Date.new(2023, 8, 10)
end

def avis
Expand Down
4 changes: 3 additions & 1 deletion app/helpers/etablissement_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ def bilan_v3?(bilan)
end

def pretty_siret(siret)
if siret.length > 6
if siret.length > 9
"#{siret[0..2]} #{siret[3..5]} #{siret[6..8]} #{siret[9..]}"
elsif siret.length > 6
"#{siret[0..5]}-#{siret[6..]}"
else
siret
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
Nous restons à votre disposition si vous avez besoin d’accompagnement.

%p
= render partial: "layouts/mailers/bizdev_signature", locals: { author_name: "William Joseph" }
= render partial: "layouts/mailers/bizdev_signature", locals: { author_name: "Benjamin Doberset" }
2 changes: 1 addition & 1 deletion app/views/administrateurs/_login_banner.html.haml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
= link_to "/administrateurs/sign_out", method: :delete, class: "header-link" do
= link_to "/administrateurs/sign_out", method: :delete do
%span.fa.fa-sign-out
Se déconnecter
2 changes: 1 addition & 1 deletion app/views/administrateurs/procedures/champs.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
= render NestedForms::FormOwnerComponent.new
.fr-grid-row
= render partial: 'champs_summary'
%div{ class: @procedure.header_sections.present? ? 'fr-col fr-col-md-9' : 'fr-col' }
.fr-col
= render TypesDeChampEditor::EditorComponent.new(revision: @procedure.draft_revision)

.padded-fixed-footer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= fields_for @champ.input_name, @champ do |form|
= turbo_stream.replace @champ.input_group_id do
= render EditableChamp::EditableChampComponent.new champ: @champ, form: form, turbo: true
= render EditableChamp::EditableChampComponent.new champ: @champ, form: form

- last_attached_file = @champ.piece_justificative_file.attachments.last
- if last_attached_file
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
- content_for(:title, "Annotations privées · Dossier nº #{@dossier.id}")
- content_for(:title, "Annotations privées · Dossier nº #{@dossier.id} (#{@dossier.owner_name})")

= render partial: "header", locals: { dossier: @dossier }

- if @display_news
= render Dsfr::NoticeComponent.new(closable: false) do |c|
- c.with_title do
Vos modifications dans les annotations privées sont maintenant sauvegardées au fur et à mesure de la saisie !

#dossier-annotations-privees
= render partial: "shared/dossiers/edit_annotations", locals: { dossier: @dossier, seen_at: @annotations_privees_seen_at }
2 changes: 1 addition & 1 deletion app/views/instructeurs/dossiers/avis.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- content_for(:title, "Avis · Dossier nº #{@dossier.id}")
- content_for(:title, "Avis · Dossier nº #{@dossier.id} (#{@dossier.owner_name})")

= render partial: "header", locals: { dossier: @dossier }

Expand Down
2 changes: 1 addition & 1 deletion app/views/instructeurs/dossiers/messagerie.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- content_for(:title, "Messagerie · Dossier nº #{@dossier.id}")
- content_for(:title, "Messagerie · Dossier nº #{@dossier.id} (#{@dossier.owner_name})")

= render partial: "header", locals: { dossier: @dossier }

Expand Down
2 changes: 1 addition & 1 deletion app/views/instructeurs/dossiers/show.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- content_for(:title, "Demande · Dossier nº #{@dossier.id}")
- content_for(:title, "Demande · Dossier nº #{@dossier.id} (#{@dossier.owner_name})")

= render partial: "header", locals: { dossier: @dossier }

Expand Down
42 changes: 0 additions & 42 deletions app/views/instructeurs/recherche/index.html.haml

This file was deleted.

8 changes: 0 additions & 8 deletions app/views/layouts/_down_time.html.haml

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/shared/dossiers/_update_champs.turbo_stream.haml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
= fields_for champ.input_name, champ do |form|
- if champ.refresh_after_update?
= turbo_stream.replace champ.input_group_id do
= render EditableChamp::EditableChampComponent.new champ:, form:, turbo: true
= render EditableChamp::EditableChampComponent.new champ:, form:
- else
= turbo_stream.update champ.labelledby_id do
= render EditableChamp::ChampLabelContentComponent.new champ:, form:
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/_login_banner.html.haml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
= link_to "/users/sign_out", method: :delete, class: "header-link" do
= link_to "/users/sign_out", method: :delete do
%span.fa.fa-sign-out
Se déconnecter
3 changes: 0 additions & 3 deletions config/custom_locales/views/en.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
en:
users:
procedure_footer:
contact:
email:
link: "By email %{service_email}"
legals:
data_retention: "%{application_name} will keep your file: %{duree_conservation_dossiers_dans_ds} months"
dematerialisation:
Expand Down
3 changes: 0 additions & 3 deletions config/custom_locales/views/fr.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
fr:
users:
procedure_footer:
contact:
email:
link: "Par courriel : %{service_email}"
legals:
data_retention: "%{application_name} conservera ce dossier : %{duree_conservation_dossiers_dans_ds} mois"
dematerialisation:
Expand Down
3 changes: 2 additions & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false

config.active_storage.service = ENV.fetch("ACTIVE_STORAGE_SERVICE", 'local').to_sym
# Store uploaded files on the local file system (see config/storage.yml for options).
config.active_storage.service = ENV.fetch("ACTIVE_STORAGE_SERVICE").to_sym

# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log
Expand Down
1 change: 1 addition & 0 deletions config/initializers/saml_idp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
persistent: -> (p) { p.id }
}
}

service_providers = {}
if ENV['SAML_DOLIST_HOST'].present?
service_providers["https://#{ENV.fetch('SAML_DOLIST_HOST')}"] =
Expand Down

0 comments on commit 1e0125c

Please sign in to comment.