@@ -4,6 +4,10 @@ It does not matter how slowly you go as long as you do not stop. First they ignore you, then they laugh at you, then they fight you, then you win. –- Mahatma Gandhi +Sat, Aug 21, 2009 +--------------------------------------------------------------------- +- Implemented :needs_approval setting for user signups. + Fri, Aug 20, 2009 --------------------------------------------------------------------- - Added new :user_signup setting (see config/settings.yml). CHANGELOG @@ -32,7 +32,7 @@ class AuthenticationsController < ApplicationController if @authentication.save && !@authentication.user.suspended? flash[:notice] = "Welcome to Fat Free CRM!" if @authentication.user.login_count > 1 && @authentication.user.last_login_at? - flash[:notice] << " Your last login was on " << @authentication.user.last_login_at.strftime("%A, %B %e at %I:%M %p.") + flash[:notice] << " Your last login was on " << @authentication.user.last_login_at.to_s(:mmddhhss) end redirect_back_or_default root_url else app/controllers/authentications_controller.rb @@ -24,7 +24,8 @@ module Admin::UsersHelper #---------------------------------------------------------------------------- def link_to_reactivate(user) - link_to_remote("Reactivate!", :method => :put, :url => reactivate_admin_user_path(user)) + name = user.awaits_approval? ? "Approve!" : "Reactivate!" + link_to_remote(name, :method => :put, :url => reactivate_admin_user_path(user)) end #---------------------------------------------------------------------------- app/helpers/admin/users_helper.rb @@ -43,7 +43,7 @@ class Authentication < Authlogic::Session::Base # NOTE: This is not ActiveRecord end end - # Override Authologic instance method in order to keep :login_counter, + # Override Authologic instance method in order to keep :login_count, # :last_login_at, and :last_login_ip intact if the user is suspended. # See vendor/plugin/authlogin/lib/authlogic/session/magic_columns.rb. #---------------------------------------------------------------------------- app/models/authentication.rb @@ -1,6 +1,8 @@ %li[user]{ highlightable(dom_id(user, :tools)) } - - if user.suspended? + - if user.awaits_approval? + .strip{:class => "signed_up"} Signed Up + - elsif user.suspended? .strip{:class => "suspended"} Suspended - elsif user.admin? .strip{:class => "admin"} Admin @@ -34,7 +36,9 @@ = pluralize(user.login_count, "login") %span.black= "|" - - if user.last_request_at + - if user.awaits_approval? + %b.cool awaits your approval + - elsif user.last_request_at %span.cool last seen #{time_ago_in_words(user.last_request_at)} ago - else %span.warn hasn't yet logged in @@ -42,7 +46,10 @@ = link_to(user.email, "mailto:" << user.email.to_s) << " | " = "phone: <b>" + user.phone << "</b> | " if user.phone? = "mobile: <b>" + user.mobile << "</b> | " if user.mobile? - - unless user.suspended? - user since #{user.created_at.to_date.to_s(:mmddyy)} + + - if !user.suspended? + %span user since #{user.created_at.to_date.to_s(:mmddyy)} + - elsif user.awaits_approval? + %b.cool signed up on #{user.created_at.to_s(:mmddhhss)} - else - %span.warn suspended on #{user.suspended_at.to_date.to_s(:mmddyy)} + %span.warn suspended on #{user.created_at.to_date.to_s(:mmddyy)} app/views/admin/users/_user.html.haml @@ -25,3 +25,4 @@ li.user .admin { background: lightblue; } li.user .suspended { background: gainsboro; } li.user .active { background: lightgreen; } + li.user .signed_up { background: lightsalmon; } app/views/common/_inline_styles.html.haml b9a746a8c51b92db03ffc264a3c2dbbf87f85067 Mike Dvorkin mike@dvorkin.net http://github.com/enderson/fat_free_crm/commit/030a796f61c77a4483dac0bc0afd7b7b0b38f4a0 030a796f61c77a4483dac0bc0afd7b7b0b38f4a0 2009-08-24T21:12:18-07:00 2009-08-24T21:12:18-07:00 Added user approval to the Admin interface [#29 state:resolved] b066c028d6f070b1e7aa5ab5df66eaf3cfd8e2ca Mike Dvorkin mike@dvorkin.net