app/controllers/spud/admin/users_controller.rb in spud_admin-0.1.0 vs app/controllers/spud/admin/users_controller.rb in spud_admin-0.2.0

- old
+ new

@@ -1,37 +1,32 @@ class Spud::Admin::UsersController < Spud::Admin::ApplicationController layout 'spud/admin/detail' + belongs_to_spud_app :users add_breadcrumb "Users", :spud_admin_users_path # filters before_filter :load_user,:only => [:edit,:update,:show,:destroy] def index - @page_thumbnail = "spud/admin/users_thumb.png" - @page_name = "Users" - @users = SpudUser.order(:login).paginate :page => params[:page] - respond_to do |format| - format.json {render :json => @users.to_json} - format.js {render :json => @users.to_json} - format.xml {render :xml => @users.to_xml} - format.html { render } - end + respond_with @users + end def show add_breadcrumb @user.full_name, :spud_admin_user_path - @page_thumbnail = "spud/admin/users_thumb.png" - @page_name = @user.full_name + respond_with @user end def new @user = SpudUser.new - - respond_to do |format| + Spud::Core.admin_applications.each do |application| + @user.spud_admin_permissions.new(:name => application[:name],:access => false) + end + respond_with @user do |format| format.js { render :partial => "new"} - format.html { render } end + end def create status = 500 @@ -59,18 +54,25 @@ end end def edit + Spud::Core.admin_applications.each do |application| + permission = @user.spud_admin_permissions.select {|perm| perm.name == application[:name]} + if permission.blank? + @user.spud_admin_permissions.new(:name => application[:name],:access => @user.super_admin) + end + end respond_to do |format| format.js { render :partial => "edit"} format.html { render } end end def update @user.attributes = params[:spud_user] @user.super_admin = params[:spud_user][:super_admin] + if @user.save flash[:notice] = "User saved successfully." redirect_to spud_admin_users_url() else flash[:error] = "There was an error while saving the user."