From e8f7aa7c4fc3b564e47e941af599fb33a826ac6a Mon Sep 17 00:00:00 2001 From: Xavier J Date: Mon, 5 Dec 2016 12:07:33 +0100 Subject: [PATCH 1/2] Add Table PreferenceDeviseProfil --- ...205110427_create_table_preference_devise_profil.rb | 11 +++++++++++ db/schema.rb | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20161205110427_create_table_preference_devise_profil.rb diff --git a/db/migrate/20161205110427_create_table_preference_devise_profil.rb b/db/migrate/20161205110427_create_table_preference_devise_profil.rb new file mode 100644 index 000000000..1f1f5c575 --- /dev/null +++ b/db/migrate/20161205110427_create_table_preference_devise_profil.rb @@ -0,0 +1,11 @@ +class CreateTablePreferenceDeviseProfil < ActiveRecord::Migration + def change + create_table :preference_devise_profils do |t| + t.string :last_current_devise_profil + end + + add_belongs_to :preference_devise_profils, :administrateurs + add_belongs_to :preference_devise_profils, :gestionnaires + add_belongs_to :preference_devise_profils, :users + end +end diff --git a/db/schema.rb b/db/schema.rb index 724af68f2..51e64b6d3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20161115053251) do +ActiveRecord::Schema.define(version: 20161205110427) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -279,6 +279,13 @@ ActiveRecord::Schema.define(version: 20161115053251) do add_index "pieces_justificatives", ["dossier_id"], name: "index_pieces_justificatives_on_dossier_id", using: :btree add_index "pieces_justificatives", ["type_de_piece_justificative_id"], name: "index_pieces_justificatives_on_type_de_piece_justificative_id", using: :btree + create_table "preference_devise_profils", force: :cascade do |t| + t.string "last_current_devise_profil" + t.integer "administrateurs_id" + t.integer "gestionnaires_id" + t.integer "users_id" + end + create_table "preference_list_dossiers", force: :cascade do |t| t.string "libelle" t.string "table" From ec83b397f78fad5862c63a271b5da0b5279c34c9 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Tue, 13 Dec 2016 14:22:54 +0100 Subject: [PATCH 2/2] Fix bug invite downcase --- app/controllers/invites_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 3c550f6d4..9f8cfbfe7 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -6,8 +6,10 @@ class InvitesController < ApplicationController class_var = @current_devise_profil.class == User ? InviteUser : InviteGestionnaire - user = User.find_by_email(params[:email]) - invite = class_var.create(dossier_id: params[:dossier_id], user: user, email: params[:email].downcase, email_sender: email_sender) + email = params[:email].downcase + + user = User.find_by_email(email) + invite = class_var.create(dossier_id: params[:dossier_id], user: user, email: email, email_sender: email_sender) if invite.valid? InviteMailer.invite_user(invite).deliver_now! unless invite.user.nil?