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

Merge pull request #2753 from betagouv/dev

Browse source 
MEP 2018-10-03-03
This commit is contained in:
Frederic Merizen 2018-10-03 17:41:02 +02:00 committed by GitHub
commit 8e1ab17f15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 101 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/new_design/administrateurs_activate.scss → app/assets/stylesheets/new_design/devise_container.scss
View file

@ -1,4 +1,4 @@
.administrateurs-activate.container {
.container.devise-container {
margin-top: 60px;
margin-bottom: 60px;
}

32
app/controllers/users/confirmations_controller.rb Normal file
View file

@ -0,0 +1,32 @@
# frozen_string_literal: true
class Users::ConfirmationsController < Devise::ConfirmationsController
layout "new_application"
# GET /resource/confirmation/new
# def new
# super
# end
# POST /resource/confirmation
# def create
# super
# end
# GET /resource/confirmation?confirmation_token=abcdef
# def show
# super
# end
# protected
# The path used after resending confirmation instructions.
# def after_resending_confirmation_instructions_path_for(resource_name)
# super(resource_name)
# end
# The path used after confirmation.
# def after_confirmation_path_for(resource_name, resource)
# super(resource_name, resource)
# end
end

2
app/controllers/users/passwords_controller.rb
View file

@ -1,4 +1,6 @@
class Users::PasswordsController < Devise::PasswordsController
layout "new_application"
after_action :try_to_authenticate_gestionnaire, only: [:update]
after_action :try_to_authenticate_administrateur, only: [:update]

7
app/models/procedure_presentation.rb
View file

@ -1,4 +1,9 @@
class ProcedurePresentation < ApplicationRecord
EXTRA_SORT_COLUMNS = {
'notifications' => Set['notifications'],
'self' => Set['id', 'state']
}
belongs_to :assign_to
delegate :procedure, to: :assign_to
@ -40,6 +45,6 @@ class ProcedurePresentation < ApplicationRecord
private
def valid_sort_column?(procedure, table, column)
DossierFieldService.valid_column?(procedure, table, column) || (table == 'notifications' && column == 'notifications')
DossierFieldService.valid_column?(procedure, table, column) || EXTRA_SORT_COLUMNS[table]&.include?(column)
end
end

43
app/views/admin/procedures/show.html.haml
View file

@ -76,49 +76,6 @@
Cette démarche n’a pas encore de lien, et n’est donc pas accessible par le public.
%br
%h3 Détails
.row{ style: 'margin-right: 3%; margin-left: 3%;' }
.description.col-xs-6.col-md-3.procedure-description
%h4.text-info
= @procedure.libelle
= h string_to_html(@procedure.description)
.champs.col-xs-6.col-md-3
%h4.text-info
Champs
.badge.progress-bar-info
= @procedure.types_de_champ.size
%ul
- @procedure.types_de_champ.order(:order_place).each do |champ|
%li= champ.libelle
.champs_private.col-xs-6.col-md-3
%h4.text-info
Annotations privées
.badge.progress-bar-info
= @procedure.types_de_champ_private.size
%ul
- @procedure.types_de_champ_private.order(:order_place).each do |champ|
%li= champ.libelle
.pieces-justificatives.col-xs-6.col-md-3
%h4.text-info
Pièces jointes
.badge.progress-bar-info
= @procedure.types_de_piece_justificative.size
- @procedure.types_de_piece_justificative.each do |piece_justificative|
= piece_justificative.libelle
%br
- durees_de_conservation = politiques_conservation_de_donnees(@procedure)
- if durees_de_conservation.present?
.row{ style: 'margin-right: 3%; margin-left: 3%;' }
.col-xs-6.col-md-3
%h4.text-info Conservation des données
- durees_de_conservation.each do |text|
%p= text
- if @procedure.publiee_ou_archivee?
%h3 Supprimer la démarche

2
app/views/administrateurs/activate/new.html.haml
View file

@ -3,7 +3,7 @@
- content_for :footer do
= render partial: "root/footer"
.administrateurs-activate.container
.container.devise-container
.one-column-centered
= form_for @administrateur, url: { controller: 'administrateurs/activate', action: :create }, html: { class: "form" } do |f|
%br

4
app/views/gestionnaires/passwords/edit.html.haml
View file

@ -17,7 +17,7 @@
= f.password_field :password, autofocus: true, autocomplete: "off", class: 'form-control'
%br
%h4
= f.label 'Retaper le mot de passe'
= f.label 'Confirmez le nouveau mot de passe'
.input-group
.input-group-addon
%span.fa.fa-asterisk
@ -25,5 +25,5 @@
%br
%br
.actions
= f.submit "Changer", class: 'btn btn-primary'
= f.submit 'Changer le mot de passe', class: 'btn btn-primary'
%br

2
app/views/gestionnaires/passwords/new.html.haml
View file

@ -17,5 +17,5 @@
%br
%br
.actions
= f.submit "Renvoyer", class: 'btn btn-primary'
= f.submit 'Réinitialiser', class: 'btn btn-primary'
%br

2
app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
View file

@ -12,7 +12,7 @@
#procedure-list
%a#onglet-infos{ href: url_for(admin_procedure_path(@procedure)) }
.procedure-list-element{ class: ('active' if active == 'Informations') }
Informations
Publication
%a#onglet-services{ href: current_administrateur.services.present? ? url_for(services_path(procedure_id: @procedure.id)) : url_for(new_service_path(procedure_id: @procedure.id)) }
.procedure-list-element

16
app/views/users/confirmations/new.html.erb
View file

@ -1,16 +0,0 @@
<h2>Renvoyer les instructions de confirmation de compte</h2>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>
<div class="field">
<%= f.label :email %><br />
<%= f.email_field :email, autofocus: true %>
</div>
<div class="actions">
<%= f.submit "Renvoyer les instructions de confirmation" %>
</div>
<% end %>
<%= render "users/shared/links" %>

17
app/views/users/confirmations/new.html.haml Normal file
View file

@ -0,0 +1,17 @@
- content_for(:title, 'Renvoyer les instructions de confirmation de compte')
- content_for :footer do
= render partial: 'root/footer'
.container.devise-container
.one-column-centered
= devise_error_messages!
= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { class: 'form' }) do |f|
%h1 Renvoyer les instructions de confirmation de compte
= f.label :email, 'Email'
= f.email_field :email, autofocus: true
= f.submit 'Renvoyer les instructions de confirmation', class: 'button primary'

43
app/views/users/passwords/edit.html.haml
View file

@ -1,29 +1,22 @@
= devise_error_messages!
- content_for(:title, 'Changement de mot de passe')
#form-login
%h2#gestionnaire_login Changement de mot de passe
- content_for :footer do
= render partial: 'root/footer'
.container.devise-container
.one-column-centered
= devise_error_messages!
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :patch, class: 'form' }) do |f|
%h1 Changement de mot de passe
%br
%br
#new-user
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
= f.hidden_field :reset_password_token
%h4
= f.label 'Nouveau mot de passe'
.input-group
.input-group-addon
%span.fa.fa-asterisk
= f.password_field :password, autofocus: true, autocomplete: "off", class: 'form-control'
%br
%h4
= f.label 'Retaper le mot de passe'
.input-group
.input-group-addon
%span.fa.fa-asterisk
= f.password_field :password_confirmation, autocomplete: "off", class: 'form-control'
%br
%br
.actions
= f.submit "Changer", class: 'btn btn-primary'
%br
= f.label 'Nouveau mot de passe'
= f.password_field :password, autofocus: true, autocomplete: 'off'
= f.label 'Confirmez le nouveau mot de passe'
= f.password_field :password_confirmation, autocomplete: 'off'
= f.submit 'Changer le mot de passe', class: 'button primary'

34
app/views/users/passwords/new.html.haml
View file

@ -1,21 +1,17 @@
= devise_error_messages!
- content_for(:title, 'Mot de passe oublié')
%br
#form-login
%h2#gestionnaire_login Mot de passe oublié
- content_for :footer do
= render partial: 'root/footer'
%br
%br
#new-user
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
%h4
= f.label :email
.input-group
.input-group-addon
%span.fa.fa-user
= f.email_field :email, class: 'form-control', placeholder: 'Email'
%br
%br
.actions
= f.submit "Renvoyer", class: 'btn btn-primary'
%br
.container.devise-container
.one-column-centered
= devise_error_messages!
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: 'form' }) do |f|
%h1 Mot de passe oublié
= f.label :email, 'Email'
= f.email_field :email, autofocus: true
= f.submit 'Réinitialier', class: 'button primary'

4
config/locales/devise.fr.yml
View file

@ -15,7 +15,7 @@ fr:
not_found_in_database: "adresse email ou mot de passe invalide."
timeout: "Votre session est expirée. Veuillez vous reconnecter pour continuer."
unauthenticated: "Vous devez vous connecter ou vous inscrire pour continuer."
unconfirmed: "Vous devez activer votre compte pour continuer."
unconfirmed: "Vous devez confirmer votre adresse email pour continuer. Cliquez sur le lien qui vous a été envoyé par email."
mailer:
confirmation_instructions:
subject: "Instructions d'activation de votre compte"
@ -34,7 +34,7 @@ fr:
no_token: "Vous ne pouvez accéder à cette page sans passer par un email de réinitialisation de mot de passe. Si vous êtes passé par un email de ce type, assurez-vous d'utiliser l'URL complète."
send_instructions: "Vous allez recevoir les instructions de réinitialisation du mot de passe dans quelques instants"
send_paranoid_instructions: "Si votre adresse email existe dans notre base de données, vous allez recevoir un lien de réinitialisation par email"
updated: "Votre mot de passe a été édité avec succès, vous êtes maintenant connecté"
updated: "Votre mot de passe a été changé avec succès, vous êtes maintenant connecté"
updated_not_active: "Votre mot de passe a été changé avec succès."
registrations:
destroyed: "Votre compte a été supprimé avec succès. Nous espérons vous revoir bientôt."

1
config/routes.rb
View file

@ -73,6 +73,7 @@ Rails.application.routes.draw do
devise_for :users, controllers: {
sessions: 'users/sessions',
registrations: 'users/registrations',
confirmations: 'users/confirmations',
passwords: 'users/passwords'
}

2
spec/models/procedure_presentation_spec.rb
View file

@ -37,6 +37,8 @@ describe ProcedurePresentation do
context 'of sort' do
it { expect(build(:procedure_presentation, sort: { "table" => "notifications", "column" => "notifications", "order" => "asc" })).to be_valid }
it { expect(build(:procedure_presentation, sort: { "table" => "self", "column" => "id", "order" => "asc" })).to be_valid }
it { expect(build(:procedure_presentation, sort: { "table" => "self", "column" => "state", "order" => "asc" })).to be_valid }
it { expect(build(:procedure_presentation, sort: { "table" => "user", "column" => "reset_password_token", "order" => "asc" })).to be_invalid }
end