Merge branch 'main' into CamilyaDellali-patch-2

This commit is contained in:
Mathieu Magnin 2024-09-20 17:10:24 +02:00 committed by GitHub
commit d1eb4b3343
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 33 additions and 17 deletions

View file

@ -16,7 +16,7 @@
.fr-fieldset__element .fr-fieldset__element
= render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }}) opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})
#password_complexity #password_complexity
= render PasswordComplexityComponent.new = render PasswordComplexityComponent.new

View file

@ -1,6 +1,7 @@
%div{ class: complexity_classes } %div{ "aria-hidden":"true", class: complexity_classes }
%div{ class: alert_classes } #password_hint{ class: alert_classes }
%h3.fr-alert__title= title %h3.fr-alert__title{ "aria-live": "polite", "aria-atomic": "true" }
= title
- if !success? - if !success?
= t(".hint_html") = t(".hint_html")

View file

@ -53,6 +53,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
replaced_by_procedure_id: Field::String, replaced_by_procedure_id: Field::String,
tags: Field::Text, tags: Field::Text,
template: Field::Boolean, template: Field::Boolean,
opendata: Field::Boolean,
hide_instructeurs_email: Field::Boolean hide_instructeurs_email: Field::Boolean
}.freeze }.freeze
@ -117,6 +118,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
:piece_justificative_multiple, :piece_justificative_multiple,
:for_tiers_enabled, :for_tiers_enabled,
:hide_instructeurs_email, :hide_instructeurs_email,
:opendata,
:replaced_by_procedure_id :replaced_by_procedure_id
].freeze ].freeze

View file

@ -18,7 +18,7 @@
.fr-fieldset__element .fr-fieldset__element
= render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }}) opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})
#password_complexity #password_complexity
= render PasswordComplexityComponent.new = render PasswordComplexityComponent.new

View file

@ -12,17 +12,19 @@
= f.hidden_field :reset_password_token = f.hidden_field :reset_password_token
%fieldset.fr-mb-0.fr-fieldset{ aria: { labelledby: 'edit-password-legend' } } %fieldset.fr-mb-0.fr-fieldset
%legend.fr-fieldset__legend#edit-password-legend %legend.fr-fieldset__legend
%h1.fr-h2= I18n.t('views.users.passwords.edit.subtitle') %h1.fr-h2= I18n.t('views.users.passwords.edit.subtitle')
.fr-fieldset__element
%p.fr-text--sm= t('utils.asterisk_html')
.fr-fieldset__element .fr-fieldset__element
= render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
opts: { autofocus: 'true', autocomplete: 'new-password', minlength: PASSWORD_MIN_LENGTH, data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }}) do |c| opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})
- c.with_describedby do
%div{ id: c.describedby_id } #password_complexity
#password_complexity = render PasswordComplexityComponent.new
= render PasswordComplexityComponent.new
.fr-fieldset__element .fr-fieldset__element
= render Dsfr::InputComponent.new(form: f, attribute: :password_confirmation, input_type: :password_field, opts: { autocomplete: 'new-password' }) = render Dsfr::InputComponent.new(form: f, attribute: :password_confirmation, input_type: :password_field, opts: { autocomplete: 'new-password' })

View file

@ -14,7 +14,7 @@
.fr-fieldset__element .fr-fieldset__element
= render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }}) opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})
#password_complexity #password_complexity
= render PasswordComplexityComponent.new = render PasswordComplexityComponent.new

View file

@ -18,7 +18,7 @@
.fr-fieldset__element .fr-fieldset__element
= render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }}) opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})
#password_complexity #password_complexity
= render PasswordComplexityComponent.new = render PasswordComplexityComponent.new

View file

@ -19,7 +19,7 @@
.fr-fieldset__element .fr-fieldset__element
= render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }}) opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})
#password_complexity #password_complexity
= render PasswordComplexityComponent.new = render PasswordComplexityComponent.new

View file

@ -0,0 +1,9 @@
# frozen_string_literal: true
class DropUnusedIndex < ActiveRecord::Migration[7.0]
disable_ddl_transaction!
def change
remove_index :champs, :type_de_champ_id
end
end

View file

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.0].define(version: 2024_09_19_130351) do ActiveRecord::Schema[7.0].define(version: 2024_09_19_145757) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "pg_buffercache" enable_extension "pg_buffercache"
enable_extension "pg_stat_statements" enable_extension "pg_stat_statements"
@ -275,7 +275,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_130351) do
t.index ["row_id"], name: "index_champs_on_row_id" t.index ["row_id"], name: "index_champs_on_row_id"
t.index ["stable_id"], name: "index_champs_on_stable_id" t.index ["stable_id"], name: "index_champs_on_stable_id"
t.index ["type"], name: "index_champs_on_type" t.index ["type"], name: "index_champs_on_type"
t.index ["type_de_champ_id"], name: "index_champs_on_type_de_champ_id"
end end
create_table "closed_mails", id: :serial, force: :cascade do |t| create_table "closed_mails", id: :serial, force: :cascade do |t|

View file

@ -19,3 +19,6 @@ Pour cela, la personne doit cliquer sur le bouton **« Action »** (ou _« Au
Et ensuite cliquer sur **« Transférer le dossier »** en indiquant votre adresse mail. Et ensuite cliquer sur **« Transférer le dossier »** en indiquant votre adresse mail.
![Image illustration linterface de transfert de dossier vers un autre compte {aria-hidden="true"}](faq/usager-transfer-dossier.png) ![Image illustration linterface de transfert de dossier vers un autre compte {aria-hidden="true"}](faq/usager-transfer-dossier.png)
Vous recevrez alors un mail de transfert de dossier que vous pourrez accepter ou rejeter depuis votre interface usager.
> **Une fois la demande de transfert acceptée, vous serez propriétaire du dossier.**