Merge pull request #4925 from betagouv/update_administrate

bump administrate

Gemfile.lock

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

app/dashboards/procedure_dashboard.rb

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

app/models/administrateur.rb

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