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

Merge pull request #3601 from betagouv/dev

Browse source 
2019-03-12-01
This commit is contained in:
Mathieu Magnin 2019-03-12 16:03:36 +01:00 committed by GitHub
commit c6c7982a22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/administrateur.rb
View file

@ -15,6 +15,7 @@ class Administrateur < ApplicationRecord
before_validation -> { sanitize_email(:email) } before_validation -> { sanitize_email(:email) }
scope :inactive, -> { where(active: false) } scope :inactive, -> { where(active: false) }
scope :with_publiees_ou_archivees, -> { joins(:procedures).where(procedures: { aasm_state: [:publiee, :archivee] }) }
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)) }

2
app/views/root/administration.html.haml
View file

@ -131,7 +131,7 @@
%ul.numbers %ul.numbers
%li.number %li.number
.number-value .number-value
= number_with_delimiter(Procedure.includes(:administrateur).publiees_ou_archivees.map(&:administrateur).uniq.count, :locale => :fr) = number_with_delimiter(Administrateur.with_publiees_ou_archivees.uniq.count, :locale => :fr)
.number-label< .number-label<
administrations administrations
%br<> %br<>