muck-users 0.2.23 → 0.3.0

data/README.rdoc

@@ -35,7 +35,9 @@ Inside of global_config.yml add the following changing the emails to match your
     from_email: 'support@example.com'
     support_email: 'support@example.com'
     admin_email: 'admin@example.com'
-
+    
+    require_access_code: false # Determines whether or not a access code is required to sign up.
+  
 === Users migration
 The users table is frequently one of the most significant of any application.  A migration to create users is not included in this
 gem so that the users tables can be customized appropriately.  Here's an example migration:

data/VERSION

@@ -1 +1 @@
-0.2.23
+0.3.0

data/app/controllers/admin/muck/access_codes_controller.rb

@@ -0,0 +1,78 @@
+class Admin::Muck::AccessCodesController < Admin::Muck::BaseController
+
+  before_filter :setup_access_code, :except => [:index, :new, :create, :bulk, :bulk_create]
+  
+  def index
+    @codes = AccessCode.by_alpha.paginate(:page => @page, :per_page => @per_page)
+    render :template => 'admin/access_codes/index'
+  end
+
+  def show
+    render :template => 'admin/access_codes/show'
+  end
+  
+  def new
+    render :template => 'admin/access_codes/new'
+  end
+  
+  def create
+    @access_code = AccessCode.new(params[:access_code])
+    if @access_code.save
+      flash[:notice] = 'Access Code was successfully added'
+      redirect_to admin_access_code_path(@access_code)
+    else
+      render :template => 'admin/access_codes/new'
+    end
+  end
+  
+  def bulk
+    @access_code = AccessCode.new
+    @access_code.code = AccessCode.random_code
+    render :template => 'admin/access_codes/bulk'
+  end
+  
+  def bulk_create
+    emails = params[:emails].split(',')
+    emails.each do |email|
+      @access_code = AccessCode.new(params[:access_code])
+      @access_code.unlimited = false
+      @access_code.use_limit = 1
+      @access_code.uses = 0
+      @access_code.code ||= AccessCode.random_code # If they specified a code then don't change it.
+      @access_code.save!
+      UserMailer.deliver_access_code(email, params[:subject], params[:message], @access_code.code)
+    end
+    flash[:notice] = translate('muck.users.bulk_access_codes_created', :email_count => emails.count)
+    redirect_to bulk_create_admin_access_codes_path
+  rescue ActiveRecord::RecordInvalid => ex
+    render :template => "admin/access_codes/bulk"
+  end
+  
+  def edit
+    render :template => "admin/access_codes/edit"
+  end
+  
+  def update
+    if @access_code.update_attributes(params[:access_code])
+      redirect_to(admin_access_code_path(@access_code))
+    else
+      flash[:notice] = 'There was a problem updating the access code.'
+      render :template => "admin/access_codes/edit"
+    end
+  end
+
+  def destroy
+    if @access_code.users.length <= 0
+      @access_code.destroy
+      flash[:notice] = "Deleted access code."
+    else
+      flash[:notice] = "Cannot delete access code it has users associated with it."
+    end
+    redirect_to admin_access_codes_path
+  end
+  
+  protected
+    def setup_access_code
+      @access_code = AccessCode.find(params[:id])
+    end
+end

data/app/controllers/admin/muck/roles_controller.rb

@@ -2,54 +2,64 @@ class Admin::Muck::RolesController < Admin::Muck::BaseController
   unloadable
   
   def index
-    @user = User.find(params[:user_id])
-    @all_roles = Role.find(:all)
+    @roles = Role.by_alpha
+    render :template => 'admin/roles/index'
   end
 
   def show
-    @role = Role.new(params[:role])
+    @role = Role.find(params[:id])
+    @users = @role.users.paginate(:page => @page, :per_page => @per_page)
+    render :template => 'admin/roles/show'
   end
 
   def new
     @role = Role.new(params[:role])
+    render :template => 'admin/roles/new', :layout => false
   end
 
   def create
     @role = Role.new(params[:role])
-
-    respond_to do |format|
-      if @role.save
-        flash[:notice] = I18n.t('muck.roles.role_created')
-        format.html { redirect_to(admin_roles_path(@role)) }
-        format.xml  { render :xml => @role, :status => :created, :location => @role }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @role.errors, :status => :unprocessable_entity }
-      end
+    if @role.save
+      ajax_update_roles
+    else
+      output_admin_messages(@role)
     end
   end
 
   def edit
-    @role = Role.new(params[:role])
+    @role = Role.find(params[:id])
+    render :template => 'admin/roles/edit', :layout => false
   end
 
   def update
-    @user = User.find(params[:user_id])
     @role = Role.find(params[:id])
-    unless @user.has_role?(@role.rolename)
-      @user.roles << @role
+    if @role.update_attributes(params[:role])
+      ajax_update_roles
+    else
+      output_admin_messages(@role)
     end
-    redirect_to :action => 'index'
   end
 
   def destroy
-    @user = User.find(params[:user_id])
     @role = Role.find(params[:id])
-    if @user.has_role?(@role.rolename)
-      @user.roles.delete(@role)
+    if @role.rolename == 'administrator'
+      flash[:notice] = translate('muck.users.cant_delete_administrator_role')
+      output_admin_messages
+    else
+      @role.delete
+      render :update do |page|
+        page.remove @role.dom_id
+      end
     end
-    redirect_to :action => 'index'
   end
 
-end
-
+  protected
+    
+    def ajax_update_roles
+      render :update do |page|
+        page.replace_html 'current-roles', :partial => 'admin/roles/role', :collection => Role.by_alpha
+        page << "jQuery('.dialog').dialog('close');"
+      end
+    end
+    
+end

data/app/controllers/admin/muck/users_controller.rb

@@ -1,15 +1,23 @@
 class Admin::Muck::UsersController < Admin::Muck::BaseController
   unloadable
     
-  before_filter :get_user, :only => [:update, :destroy]
+  before_filter :get_user, :only => [:update, :destroy, :permissions]
   before_filter :setup_subnavigation
   
   def index
-    @user_count = User.count
-    @user_inactive_count = User.inactive_count
-    @users = User.by_newest.paginate(:page => @page, :per_page => @per_page)
     respond_to do |format|
-      format.html { render :template => 'admin/users/index' }
+      format.html do
+        @user_count = User.count
+        @user_inactive_count = User.inactive_count
+        @users = User.by_newest.paginate(:page => @page, :per_page => @per_page, :include => ['roles'])
+        render :template => 'admin/users/index'
+      end
+      format.csv do
+        @users = User.find(:all)
+        headers["Content-Type"] = 'text/csv'
+        headers["Content-Disposition"] = "attachment; filename=\"users.csv\"" 
+        render :layout => false 
+      end
     end
   end
 
@@ -61,24 +69,31 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
   end
 
   def update
-    if is_me?(@user)
-      message = I18n.t("muck.users.cannot_deactivate_yourself")
-    else
-      if @user.force_activate!
-        message = I18n.t('muck.users.user_marked_active')
+    
+    if params[:deactivate]
+      if is_me?(@user)
+        message = translate("muck.users.cannot_deactivate_yourself")
       else
-        message = I18n.t('muck.users.user_marked_inactive')
-      end
-    end    
-    activate_text = '<div class="flasherror">' + message + '</div>'
-    activate_text << render_to_string(:partial => 'admin/users/activate', :locals => {:user => @user})
-    respond_to do |format|
-      format.js do
-        render :update do |page|
-          page.replace_html @user.dom_id('link'), activate_text
+        if @user.deactivate!
+          return update_activate(translate('muck.users.user_marked_inactive'))
+        else
+          message = translate('muck.users.user_not_deactivated_error')
         end
       end
+    elsif params[:activate]
+      if @user.activate!
+        return update_activate(translate('muck.users.user_marked_active'))
+      else
+        message = translate('muck.users.user_not_activated_error')
+      end
+    else
+      params[:user][:role_ids] ||= []
+      if @user.update_attributes(params[:user])
+        return update_permissions(@user, translate('muck.users.updated_permissions'))
+      end
     end
+    flash[:notice] = message
+    output_admin_messages(@user)
   end
 
   def enable
@@ -106,7 +121,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
     @user.destroy
     respond_to do |format|
       format.html do
-        flash[:notice] = I18n.t('muck.users.user_successfully_deleted', :login => @user.login)
+        flash[:notice] = translate('muck.users.user_successfully_deleted', :login => @user.login)
         redirect_to admin_users_path
       end
       format.xml  { head :ok }
@@ -114,8 +129,28 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
     end
   end
   
-  private 
+  def permissions
+    render :template => 'admin/users/permissions', :layout => false
+  end
   
+  protected
+
+    def update_permissions(user, message)
+      flash[:notice] = message
+      render :update do |page|
+        page << "jQuery('.dialog').dialog('close');"
+        page.replace_html user.dom_id('permissions'), :partial => 'admin/permissions/permission', :collection => user.permissions, :locals => { :user => user }
+      end
+    end
+      
+    def update_activate(message)
+      flash[:notice] = message
+      render :update do |page|
+        page.replace_html 'admin-messages', output_flash
+        page.replace_html @user.dom_id('link'), :partial => 'admin/users/activate', :locals => { :user => @user }
+      end
+    end
+    
     def get_user
       @user = User.find(params[:id])
     end

data/app/controllers/muck/access_code_requests_controller.rb

@@ -0,0 +1,27 @@
+class Muck::AccessCodeRequestsController < ApplicationController
+  unloadable
+  layout 'popup'
+
+  ssl_required :new, :create
+  before_filter :not_logged_in_required
+
+  def show
+    render :template => 'access_code_requests/show'
+  end
+  
+  def new
+    @page_title = t('muck.users.request_access_code')
+    render :template => 'access_code_requests/new'
+  end
+    
+  def create
+    @page_title = t('muck.users.request_access_code')
+    @access_code_request = AccessCodeRequest.new(params[:access_code_request])
+    if @access_code_request.save
+      redirect_to access_code_request_path(@access_code_request)
+    else
+      render :action => "access_code_requests/new"
+    end
+  end
+
+end

data/app/controllers/muck/activations_controller.rb

@@ -1,4 +1,3 @@
-# new file app/controllers/activations_controller.rb
 class Muck::ActivationsController < ApplicationController
   unloadable
   

data/app/controllers/muck/users_controller.rb

@@ -51,7 +51,7 @@ class Muck::UsersController < ApplicationController
     @page_title = t('muck.users.register_account', :application_name => GlobalConfig.application_name)
     cookies.delete :auth_token
     @user = User.new(params[:user])
-    
+    check_access_code
     check_recaptcha
     success, path = setup_user
     after_create_response(success, path)
@@ -126,151 +126,163 @@ class Muck::UsersController < ApplicationController
 
   protected 
 
-  def valid_email?(email)
-    user = User.new(:email => email)
-    user.valid?
-    if user.errors[:email]
-      [false, user.errors[:email]]
-    else
-      [true, '']
+    def valid_email?(email)
+      user = User.new(:email => email)
+      user.valid?
+      if user.errors[:email]
+        [false, user.errors[:email]]
+      else
+        [true, '']
+      end
     end
-  end
   
-  def standard_response(template)
-    respond_to do |format|
-      format.html { render :template => "users/#{template}" }
-      format.xml { render :xml => @user }
+    def standard_response(template)
+      respond_to do |format|
+        format.html { render :template => "users/#{template}" }
+        format.xml { render :xml => @user }
+      end
     end
-  end
   
-  def after_create_response(success, local_uri = '')
-    if success
-      respond_to do |format|
-        format.html { redirect_to local_uri }
-        format.xml { render :xml => @user, :status => :created, :location => user_url(@user) }
+    def after_create_response(success, local_uri = '')
+      if success
+        respond_to do |format|
+          format.html { redirect_to local_uri }
+          format.xml { render :xml => @user, :status => :created, :location => user_url(@user) }
+        end
+      else
+        respond_to do |format|
+          format.html { render :template => "users/new" }
+          format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
+        end
       end
-    else
-      respond_to do |format|
-        format.html { render :template => "users/new" }
-        format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
+    end
+  
+    # Sign up methods
+    def check_access_code
+      if GlobalConfig.require_access_code
+        access_code, valid_code = AccessCode.valid_code?(params[:user][:access_code_code])
+        if valid_code
+          @user.access_code = access_code
+        else
+          flash[:notice] = translate('muck.users.access_required_warning')
+          raise Exceptions::InvalidAccessCode
+        end
       end
     end
-  end
   
-  # Sign up methods
-  def check_recaptcha
-    if GlobalConfig.use_recaptcha
-      if !(verify_recaptcha(@user) && @user.valid?)
-        raise ActiveRecord::RecordInvalid, @user
+    def check_recaptcha
+      if GlobalConfig.use_recaptcha
+        if !(verify_recaptcha(@user) && @user.valid?)
+          raise ActiveRecord::RecordInvalid, @user
+        end
       end
     end
-  end
   
-  def setup_user
-    if GlobalConfig.automatically_activate
-      if GlobalConfig.automatically_login_after_account_create
-        setup_user_login
+    def setup_user
+      if GlobalConfig.automatically_activate
+        if GlobalConfig.automatically_login_after_account_create
+          setup_user_login
+        else
+          setup_user_no_login
+        end
       else
-        setup_user_no_login
+        setup_user_no_activate
       end
-    else
-      setup_user_no_activate
     end
-  end
   
-  def setup_user_login
-    path = ''
-    success = false
-    if @user.save
-      @user.activate!
-      UserSession.create(@user)
-      send_welcome_email
-      flash[:notice] = t('muck.users.thanks_sign_up')
-      success = true
-      path = signup_complete_path(@user)
-    else
+    def setup_user_login
+      path = ''
       success = false
+      if @user.save
+        @user.activate!
+        UserSession.create(@user)
+        send_welcome_email
+        flash[:notice] = t('muck.users.thanks_sign_up')
+        success = true
+        path = signup_complete_path(@user)
+      else
+        success = false
+      end
+      [success, path]
     end
-    [success, path]
-  end
   
-  def setup_user_no_login
-    path = ''
-    success = false
-    if @user.save_without_session_maintenance
-      @user.activate!
-      send_welcome_email
-      flash[:notice] = t('muck.users.thanks_sign_up_login')
-      success = true
-      path = signup_complete_login_required_path(@user)
-    else
+    def setup_user_no_login
+      path = ''
       success = false
+      if @user.save_without_session_maintenance
+        @user.activate!
+        send_welcome_email
+        flash[:notice] = t('muck.users.thanks_sign_up_login')
+        success = true
+        path = signup_complete_login_required_path(@user)
+      else
+        success = false
+      end
+      [success, path]
     end
-    [success, path]
-  end
   
-  def setup_user_no_activate
-    path = ''
-    success = false
-    if @user.save_without_session_maintenance
-      @user.deliver_activation_instructions!
-      flash[:notice] = t('muck.users.thanks_sign_up_check')
-      success = true
-      path = signup_complete_activation_required_path(@user)
-    else
+    def setup_user_no_activate
+      path = ''
       success = false
+      if @user.save_without_session_maintenance
+        @user.deliver_activation_instructions!
+        flash[:notice] = t('muck.users.thanks_sign_up_check')
+        success = true
+        path = signup_complete_activation_required_path(@user)
+      else
+        success = false
+      end
+      [success, path]
     end
-    [success, path]
-  end
   
-  def send_welcome_email
-    begin
-      @user.deliver_welcome_email
-    rescue Net::SMTPAuthenticationError => ex
-      # TODO figure out what to do when email fails
-      # @user.no_welcome_email = 
+    def send_welcome_email
+      begin
+        @user.deliver_welcome_email
+      rescue Net::SMTPAuthenticationError => ex
+        # TODO figure out what to do when email fails
+        # @user.no_welcome_email = 
+      end
     end
-  end
   
-  # override redirect by adding :redirect_to as a hidden field in your form or as a url param
-  def after_update_response(success)
-    if success
-      respond_to do |format|
-        format.html do
-          get_redirect_to do
-            redirect_to admin? ? public_user_path(@user) : user_path(@user)
+    # override redirect by adding :redirect_to as a hidden field in your form or as a url param
+    def after_update_response(success)
+      if success
+        respond_to do |format|
+          format.html do
+            get_redirect_to do
+              redirect_to admin? ? public_user_path(@user) : user_path(@user)
+            end
           end
+          format.xml{ head :ok }
+        end
+      else
+        respond_to do |format|
+          format.html { render :template => 'users/edit' }
+          format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
         end
-        format.xml{ head :ok }
-      end
-    else
-      respond_to do |format|
-        format.html { render :template => 'users/edit' }
-        format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
       end
     end
-  end
   
-  # override redirect by adding :redirect_to as a hidden field in your form or as a url param
-  def after_destroy_response
-    respond_to do |format|
-      format.html do
-        flash[:notice] = t('muck.users.login_out_success')
-        get_redirect_to do
-          redirect_to(login_url)
+    # override redirect by adding :redirect_to as a hidden field in your form or as a url param
+    def after_destroy_response
+      respond_to do |format|
+        format.html do
+          flash[:notice] = t('muck.users.login_out_success')
+          get_redirect_to do
+            redirect_to(login_url)
+          end
         end
+        format.xml { head :ok }
       end
-      format.xml { head :ok }
     end
-  end
   
-  def permission_denied
-    flash[:notice] = t('muck.users.permission_denied')
-    respond_to do |format|
-      format.html do
-        redirect_to user_path(current_user)
+    def permission_denied
+      flash[:notice] = t('muck.users.permission_denied')
+      respond_to do |format|
+        format.html do
+          redirect_to user_path(current_user)
+        end
       end
     end
-  end
 
 end