app/views/layouts/_about.html.haml
spec/views/authentications/new.haml_spec.rb
@@ -4,11 +4,17 @@ 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
+Fri, Aug 20, 2009
+---------------------------------------------------------------------
+- Added new :user_signup setting (see config/settings.yml).
+- User signups are only allowed if :user_signup is set to :allowed or :needs_approval.
+
Thu, Aug 20, 2009
---------------------------------------------------------------------
- Added support for unattended [rake crm:setup] and [rake crm:setup:admin] tasks.
- Warn about database reset in [rake crm:setup] task.
- Removed dependency on Highline gem and removed it from vendors/gems.
+- Added [:user_signup] setting and started with the signup permissions.
Wed, Aug 19, 2009
---------------------------------------------------------------------
CHANGELOG
@@ -17,7 +17,7 @@
class ApplicationController < ActionController::Base
helper(application_helpers)
- helper_method :current_user_session, :current_user
+ helper_method :current_user_session, :current_user, :can_signup?
helper_method :called_from_index_page?, :called_from_landing_page?
filter_parameter_logging :password, :password_confirmation
@@ -88,6 +88,11 @@ class ApplicationController < ActionController::Base
end
#----------------------------------------------------------------------------
+ def can_signup?
+ [ :allowed, :needs_approval ].include? Setting.user_signup
+ end
+
+ #----------------------------------------------------------------------------
def called_from_index_page?(controller = controller_name)
if controller != "tasks"
request.referer =~ %r(/#{controller}$)
app/controllers/application_controller.rb
@@ -34,7 +34,7 @@ class PasswordsController < ApplicationController
redirect_to root_url
else
flash[:notice] = "No user was found with that email address."
- render :action => :new
+ redirect_to :action => :new
end
end
app/controllers/passwords_controller.rb
@@ -44,11 +44,15 @@ class UsersController < ApplicationController
# GET /users/new.xml HTML
#----------------------------------------------------------------------------
def new
- @user = User.new
+ if can_signup?
+ @user = User.new
- respond_to do |format|
- format.html # new.html.haml <-- signup form
- format.xml { render :xml => @user }
+ respond_to do |format|
+ format.html # new.html.haml <-- signup form
+ format.xml { render :xml => @user }
+ end
+ else
+ redirect_to login_path
end
end
app/controllers/users_controller.rb
@@ -2,7 +2,8 @@
-# The following form gets submitted to #create when @authentication is nil,
-# or to #update when @authentication is not nil (ex. suspended).
- form_for @authentication, :url => authentication_path do |f|
- .title_tools== Don't have an account? #{link_to 'Sign Up Now!', signup_path}
+ - if can_signup?
+ .title_tools== Don't have an account? #{link_to 'Sign Up Now!', signup_path}
.title Login
.warn= "Invalid username or password" unless f.error_messages.blank?
.section
@@ -10,10 +11,9 @@
= f.text_field :username
.label Password:
= f.password_field :password
- .label
- .check_box
- = f.check_box(:remember_me) << " Remember me"
+ %div(style="margin-left:12px") #{f.check_box(:remember_me)} Remember me
+ %br
.buttonbar
= f.submit "Login"
or
app/views/authentications/new.html.haml
@@ -1,22 +1,6 @@
#footer
== Powered by #{link_to "Fat Free CRM", "http://www.fatfreecrm.com", :popup => true }
== © 2008-#{Date.today.year} by Michael Dvorkin
- == | #{link_to "About", "#about", :rel => "facebox" }
+ == | #{link_to("About", "#about", :rel => "facebox")}
%br
-#about{ hidden }
- %h3
- Fat Free CRM version
- %span.cool== v#{FatFreeCRM::Version}
- == (#{ActiveRecord::Base.connection.adapter_name.downcase})
- %p
- Thank you for using Fat Free CRM! We appreciate your business and hope
- you enjoy using the software.
- %p
- Few resources that you might find helpful (links open in a new window):
- %ul{:style => "margin: 0px 0px 0px 15px"}
- %li== » #{link_to "Home page", "http://www.fatfreecrm.com", :popup => true}
- %li== » #{link_to "Project page", "http://github.com/michaeldv/fat_free_crm/tree/master", :popup => true}
- %li== » #{link_to "Features and bugs", "http://fatfreecrm.lighthouseapp.com", :popup => true}
- %li== » #{link_to "Twitter commit updates", "http://twitter.com/fatfreecrm", :popup => true}
- %li== » #{link_to "Discussion group for users", "http://groups.google.com/group/fat-free-crm-users", :popup => true}
- %li== » #{link_to "Discussion group for developers", "http://groups.google.com/group/fat-free-crm-dev", :popup => true}
+= render :partial => "layouts/about"
\ No newline at end of file
app/views/layouts/_footer.html.haml
@@ -14,7 +14,7 @@
= render :partial => "/layouts/jumpbox"
- else
= link_to("Login", login_path) << " |"
- = link_to("Sign Up", signup_path)
- -# link_to("Help", "/")
+ = link_to("Sign Up", signup_path) if can_signup?
+ = link_to("About", "#about", :rel => "facebox")
%h3
= link_to("Fat Free CRM", root_path)
app/views/layouts/_header.html.haml
@@ -1,2 +1,4 @@
= show_flash(:sticky => true)
-.tabless= yield
\ No newline at end of file
+.tabless= yield
+%br
+= render :partial => "layouts/about"
\ No newline at end of file
app/views/layouts/_tabless.html.haml
@@ -4,15 +4,14 @@
%meta{ "http-equiv" => "Content-Type", :content => "text/html; charset=utf-8" }
%title Fat Free CRM
== <!-- #{controller.controller_name} : #{controller.action_name} -->
- = stylesheet_link_tag "screen", :cache => "cache/all"
+ = stylesheet_link_tag "screen", "/facebox/facebox.css", :cache => "cache/all"
- unless tabless_layout?
= stylesheet_link_tag "calendar_date_select/default.css"
- = stylesheet_link_tag "/facebox/facebox.css"
%style= yield :styles
- = javascript_include_tag :defaults, :cache => "cache/all"
+ = javascript_include_tag :defaults, "/facebox/facebox.js", :cache => "cache/all"
- unless tabless_layout?
- = javascript_include_tag "crm_classes.js", "calendar_date_select/calendar_date_select.js", "calendar_date_select/format_american.js", "/facebox/facebox.js", :cache => "cache/classes"
+ = javascript_include_tag "crm_classes.js", "calendar_date_select/calendar_date_select.js", "calendar_date_select/format_american.js", :cache => "cache/classes"
%script{:type => "text/javascript"}= yield :javascript
%body
app/views/layouts/application.html.haml
@@ -8,5 +8,6 @@
= f.password_field :password
.label Password confirmation:
= f.password_field :password_confirmation
+ %br
.buttonbar
= f.submit "Update Password and Login"
app/views/passwords/edit.html.haml
@@ -5,5 +5,6 @@
.section
.label Email address:
= text_field_tag :email
+ %br
.buttonbar
= submit_tag "Reset Password"
app/views/passwords/new.html.haml
@@ -15,7 +15,7 @@
# along with this program. If not, see <http:#www.gnu.org/licenses/>.
#------------------------------------------------------------------------------
-# Defaul applications settings to be loaded during installation:
+# Default application settings to be loaded during installation:
#
# rake crm:settings:load
#
@@ -35,6 +35,13 @@
{ :active : true, :text : "Plugins", :url : { :controller : "admin/plugins" } }
]
+# The following setting controls user signup. Possible values are:
+# :allowed -- users can sign up and use the system once they have registered.
+# :needs_approval -- users can sign up but must be approved before they can use the system.
+# :not_allowed -- users can only be added by system administrator. This is the default.
+
+:user_signup: :not_allowed
+
campaign_status:
:planned : Planned
:started : Started
config/settings.yml
@@ -71,13 +71,25 @@ describe UsersController do
#----------------------------------------------------------------------------
describe "responding to GET new" do
- it "should expose a new user as @user and render [new] template" do
- @user = Factory.build(:user)
- User.stub!(:new).and_return(@user)
+ describe "if user is allowed to sign up" do
+ it "should expose a new user as @user and render [new] template" do
+ controller.should_receive(:can_signup?).and_return(true)
+ @user = Factory.build(:user)
+ User.stub!(:new).and_return(@user)
- get :new
- assigns[:user].should == @user
- response.should render_template("users/new")
+ get :new
+ assigns[:user].should == @user
+ response.should render_template("users/new")
+ end
+ end
+
+ describe "if user is not allowed to sign up" do
+ it "should redirect to login_path" do
+ controller.should_receive(:can_signup?).and_return(false)
+
+ get :new
+ response.should redirect_to(login_path)
+ end
end
end
spec/controllers/users_controller_spec.rb
@@ -49,6 +49,12 @@ end
# Load default settings from config/settings.yml
Factory(:default_settings)
+# See vendor/plugins/authlogic/lib/authlogic/test_case.rb
+#----------------------------------------------------------------------------
+def activate_authlogic
+ Authlogic::Session::Base.controller = (@request && Authlogic::TestCase::RailsRequestAdapter.new(@request)) || controller
+end
+
# Note: Authentication is NOT ActiveRecord model, so we mock and stub it using RSpec.
#----------------------------------------------------------------------------
def login(user_stubs = {}, session_stubs = {})
spec/spec_helper.rb
319129b24dda3ec90d807c62cd209dab846c998b
Mike Dvorkin
mike@dvorkin.net
http://github.com/enderson/fat_free_crm/commit/07be9dd7864568f4318aca911f4b08d600bac543
07be9dd7864568f4318aca911f4b08d600bac543
2009-08-21T22:28:44-07:00
2009-08-21T22:28:44-07:00
Added new :user_signup setting (see config/settings.yml); user signups are only allowed if :user_signup is set to :allowed or :needs_approval
[#29 state:open]
ae4abda7a4c33e654a64058a2a0263b3a6de6215
Mike Dvorkin
mike@dvorkin.net