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

Merge pull request #7860 from mfo/US/procedure-duree-up-to-manager

Browse source 
feat(procedure.max_duree_conservation_dossiers_dans_ds): make it more flexible
This commit is contained in:
mfo 2022-10-06 11:36:50 +02:00 • committed by GitHub
commit 8a3550cda4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/dashboards/procedure_dashboard.rb
View file

@ -38,7 +38,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
attestation_template: AttestationTemplateField,
procedure_expires_when_termine_enabled: Field::Boolean,
duree_conservation_dossiers_dans_ds: Field::Number,
duree_conservation_etendue_par_ds: Field::Boolean
max_duree_conservation_dossiers_dans_ds: Field::Number
}.freeze
# COLLECTION_ATTRIBUTES
@ -88,7 +88,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
:attestation_template,
:procedure_expires_when_termine_enabled,
:duree_conservation_dossiers_dans_ds,
:duree_conservation_etendue_par_ds
:max_duree_conservation_dossiers_dans_ds
].freeze
# FORM_ATTRIBUTES
@ -97,7 +97,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
FORM_ATTRIBUTES = [
:procedure_expires_when_termine_enabled,
:duree_conservation_dossiers_dans_ds,
:duree_conservation_etendue_par_ds
:max_duree_conservation_dossiers_dans_ds
].freeze
# Overwrite this method to customize how procedures are displayed

22
app/models/procedure.rb
View file

@ -32,6 +32,7 @@
# lien_dpo :string
# lien_notice :string
# lien_site_web :string
# max_duree_conservation_dossiers_dans_ds :integer default(12)
# monavis_embed :text
# opendata :boolean default(TRUE)
# organisation :string
@ -275,18 +276,15 @@ class Procedure < ApplicationRecord
validates :duree_conservation_dossiers_dans_ds, allow_nil: false,
numericality: {
only_integer: true,
greater_than_or_equal_to: 1,
less_than_or_equal_to: OLD_MAX_DUREE_CONSERVATION
},
if: :duree_conservation_etendue_par_ds
validates :duree_conservation_dossiers_dans_ds, allow_nil: false,
numericality: {
only_integer: true,
greater_than_or_equal_to: 1,
less_than_or_equal_to: NEW_MAX_DUREE_CONSERVATION
},
unless: :duree_conservation_etendue_par_ds
greater_than_or_equal_to: 1,
less_than_or_equal_to: :max_duree_conservation_dossiers_dans_ds
}
validates :max_duree_conservation_dossiers_dans_ds, allow_nil: false,
numericality: {
only_integer: true,
greater_than_or_equal_to: 1,
less_than_or_equal_to: 60
}
validates :lien_dpo, email_or_link: true, allow_nil: true
validates_with MonAvisEmbedValidator