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

Merge pull request #4925 from betagouv/update_administrate

Browse source 
bump administrate
This commit is contained in:
LeSim 2020-03-24 15:58:23 +01:00 • committed by GitHub
commit 6f4bac7076
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Gemfile.lock
View file

@ -78,7 +78,7 @@ GEM
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
administrate (0.12.0) administrate (0.13.0)
actionpack (>= 4.2) actionpack (>= 4.2)
actionview (>= 4.2) actionview (>= 4.2)
activerecord (>= 4.2) activerecord (>= 4.2)
@ -212,7 +212,7 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
faraday (0.15.4) faraday (0.15.4)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ffi (1.9.25) ffi (1.12.2)
flipper (0.17.2) flipper (0.17.2)
flipper-active_record (0.17.2) flipper-active_record (0.17.2)
activerecord (>= 4.2, < 7) activerecord (>= 4.2, < 7)
@ -588,10 +588,9 @@ GEM
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.0.0) sassc (2.2.1)
ffi (~> 1.9.6) ffi (~> 1.9)
rake sassc-rails (2.1.2)
sassc-rails (2.1.0)
railties (>= 4.0.0) railties (>= 4.0.0)
sassc (>= 2.0) sassc (>= 2.0)
sprockets (> 3.0) sprockets (> 3.0)

2
app/dashboards/procedure_dashboard.rb
View file

@ -12,7 +12,6 @@ class ProcedureDashboard < Administrate::BaseDashboard
types_de_champ_private: TypesDeChampCollectionField, types_de_champ_private: TypesDeChampCollectionField,
path: ProcedureLinkField, path: ProcedureLinkField,
dossiers: Field::HasMany, dossiers: Field::HasMany,
instructeurs: Field::HasMany,
administrateurs: Field::HasMany, administrateurs: Field::HasMany,
id: Field::Number.with_options(searchable: true), id: Field::Number.with_options(searchable: true),
libelle: Field::String, libelle: Field::String,
@ -75,7 +74,6 @@ class ProcedureDashboard < Administrate::BaseDashboard
:types_de_champ_private, :types_de_champ_private,
:for_individual, :for_individual,
:auto_archive_on, :auto_archive_on,
:instructeurs,
:initiated_mail_template, :initiated_mail_template,
:received_mail_template, :received_mail_template,
:closed_mail_template, :closed_mail_template,

2
app/models/administrateur.rb
View file

@ -18,7 +18,7 @@ class Administrateur < ApplicationRecord
end end
def email def email
user.email user&.email
end end
# validate :password_complexity, if: Proc.new { |a| Devise.password_length.include?(a.password.try(:size)) } # validate :password_complexity, if: Proc.new { |a| Devise.password_length.include?(a.password.try(:size)) }