[Fixes #2597] Remove given_name and family_name delegation
This commit is contained in:
parent
12f0c99b5a
commit
14c8e02aca
5 changed files with 4 additions and 34 deletions
Binary file not shown.
Before Width: | Height: | Size: 25 KiB |
|
@ -238,18 +238,6 @@ div.pagination {
|
|||
left: 23% !important;
|
||||
}
|
||||
|
||||
#fconnect-profile {
|
||||
margin-top: 5px;
|
||||
display: inline-block;
|
||||
|
||||
a {
|
||||
color: #3471A9 !important;
|
||||
text-decoration: none;
|
||||
font-size: 16px !important;
|
||||
margin-right: 0px !important;
|
||||
}
|
||||
}
|
||||
|
||||
.no-padding {
|
||||
padding: 0;
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ class User < ApplicationRecord
|
|||
has_many :feedbacks, dependent: :destroy
|
||||
has_one :france_connect_information, dependent: :destroy
|
||||
|
||||
delegate :given_name, :family_name, :email_france_connect, :gender, :birthdate, :birthplace, :france_connect_particulier_id, to: :france_connect_information
|
||||
delegate :email_france_connect, :gender, :birthdate, :birthplace, :france_connect_particulier_id, to: :france_connect_information
|
||||
accepts_nested_attributes_for :france_connect_information
|
||||
|
||||
before_validation -> { sanitize_email(:email) }
|
||||
|
|
|
@ -1,12 +1,3 @@
|
|||
- if current_user.loged_in_with_france_connect?
|
||||
#fconnect-profile{ "data-fc-logout-url" => '/users/sign_out" data-method="delete' }
|
||||
%a.text-info{ href: "#" }
|
||||
= "#{current_user.given_name} #{current_user.family_name}"
|
||||
= link_to "/users/sign_out", method: :delete do
|
||||
%span.fa.fa-sign-out
|
||||
Se déconnecter
|
||||
|
||||
- else
|
||||
= link_to "/users/sign_out", method: :delete do
|
||||
%span.fa.fa-sign-out
|
||||
Se déconnecter
|
||||
= link_to "/users/sign_out", method: :delete do
|
||||
%span.fa.fa-sign-out
|
||||
Se déconnecter
|
||||
|
|
9
vendor/assets/stylesheets/franceconnect.scss
vendored
9
vendor/assets/stylesheets/franceconnect.scss
vendored
|
@ -39,15 +39,6 @@
|
|||
width: 38px;
|
||||
}
|
||||
|
||||
#fconnect-profile > a {
|
||||
padding: 15px 0 15px 50px;
|
||||
color: #ffffff;
|
||||
margin-right: 10px;
|
||||
font-size: 18px;
|
||||
background: image-url('logo_mini_FC.png') left center no-repeat;
|
||||
background-size: 40px;
|
||||
}
|
||||
|
||||
#fconnect-access {
|
||||
all: initial;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
|
|
Loading…
Reference in a new issue