From 3275c05a5ff42c400b1796bba1d9a36fded1dc07 Mon Sep 17 00:00:00 2001 From: Jonas Folvik Date: Mon, 4 Jan 2016 21:39:52 +0100 Subject: [PATCH] Added retired Added the retired suffix --- app/controllers/application_controller.rb | 5 +++++ app/models/user.rb | 4 ++++ app/views/users/edit.html.erb | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d1ad4fe..3837ff0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base helper_method :admin? helper_method :superadmin? helper_method :donor? + helper_method :retired? helper_method :developer? helper_method :trainingmod? helper_method :lead_mod? @@ -74,6 +75,10 @@ class ApplicationController < ActionController::Base !!(current_user && current_user.donor?) end + def retired? + !!(current_user && current_user.retired?) + end + def developer? !!(current_user && current_user.developer?) end diff --git a/app/models/user.rb b/app/models/user.rb index 22a7e20..7caf0ca 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -35,6 +35,10 @@ class User < ActiveRecord::Base !!self.donor end + def retired? + !!self.retired + end + def developer? !!self.developer end diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 8d24076..ec546ac 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -39,6 +39,12 @@ <%= f.select :donor, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %> + + Retired + + <%= f.select :retired, [["No", false], ["Yes", true]], {}, { disabled: !can_edit? } %> + + <% end %> <% if admin? %>