From 2542759620b2419d9f3d85a7f072e430d26bb847 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 24 Apr 2019 19:07:53 +0200 Subject: [PATCH] suite --- app/controllers/admin/admins_controller.rb | 2 +- app/models/admin.rb | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/admins_controller.rb b/app/controllers/admin/admins_controller.rb index b4b0609..6064acf 100644 --- a/app/controllers/admin/admins_controller.rb +++ b/app/controllers/admin/admins_controller.rb @@ -16,7 +16,7 @@ class Admin::AdminsController < ApplicationController def new - @admin = Admin.new + @admin = Admin.new(:contact_role => true) end diff --git a/app/models/admin.rb b/app/models/admin.rb index 1156fc7..98694bc 100644 --- a/app/models/admin.rb +++ b/app/models/admin.rb @@ -26,6 +26,21 @@ class Admin < ActiveRecord::Base before_create { generate_token(:remember_token) } + before_validation do + if self.generate_mdp == "1" and (self.password.to_s == "") + self.password = "123456" + end + end + + def mdp_needed? + if generate_mdp == "1" + true + else + false + + end + end + def generate_mdp_now ps = SecureRandom.hex(4) self.password = ps