Merge 'standardization' and 'role structure modification'

app/controllers/admin/user_info_models_controller.rb

@@ -0,0 +1,59 @@
+class Admin::UserInfoModelsController < ApplicationController
+  
+  layout "admin"
+  before_filter :authenticate_user!
+  before_filter :is_admin?
+  before_filter :set_attribute, :only => [:index, :show, :new, :edit]
+
+  def index
+    @user_attribute_models = UserInfoModel.all.entries
+    render :template => 'admin/user_attribute_models/index'
+  end
+  
+  def show
+    #@user_attribute_model = UserInfoModel.find(params[:id])
+  end
+  
+  def new
+    @user_attribute_model = UserInfoModel.new
+    render :template => 'admin/user_attribute_models/new'
+  end
+  
+  def edit
+    @user_attribute_model = UserInfoModel.find(params[:id])
+    @i18n_variable = @user_attribute_model.i18n_variable
+    render :template => 'admin/user_attribute_models/edit'
+  end
+  
+  def create
+    @user_attribute_model = UserInfoModel.new(params[:user_info_model])
+    @user_attribute_model.save
+    redirect_to :action => :index
+  end
+  
+  def update
+    @user_attribute_model = UserInfoModel.find(params[:id])
+    @user_attribute_model.update_attributes(params[:user_info_model])
+    respond_to do |format|
+      format.html { redirect_to :action => :index }
+      format.js  { render 'admin/user_attribute_models/toggle_enable' }
+    end
+  end
+  
+  def destroy
+    @user_attribute_model = UserInfoModel.find(params[:id])
+    @user_attribute_model.destroy
+    
+    @user_attribute_model.destroy_i18n_variables
+    
+    redirect_to :action => :index
+  end
+  
+  protected
+  
+  def set_attribute
+    @attribute = 'info'
+	@class = 'infos'
+  end
+  
+end

app/controllers/admin/user_role_models_controller.rb

@@ -0,0 +1,60 @@
+class Admin::UserRoleModelsController < ApplicationController
+  
+  layout "admin"
+  before_filter :authenticate_user!
+  before_filter :is_admin?
+  before_filter :set_attribute, :only => [:index, :show, :new, :edit]
+
+  def index
+    @user_attribute_models = UserRoleModel.all.entries
+    render :template => 'admin/user_attribute_models/index'
+  end
+  
+  def show
+    #@user_attribute_model = UserRoleModel.find(params[:id])
+  end
+  
+  def new
+    @user_attribute_model = UserRoleModel.new
+    render :template => 'admin/user_attribute_models/new'
+  end
+  
+  def edit
+    @user_attribute_model = UserRoleModel.find(params[:id])
+    @i18n_variable = @user_attribute_model.i18n_variable
+    render :template => 'admin/user_attribute_models/edit'
+  end
+  
+  def create
+    @user_attribute_model = UserRoleModel.new(params[:user_role_model])
+    @user_attribute_model.save
+    redirect_to :action => :index
+  end
+  
+  def update
+    @user_attribute_model = UserRoleModel.find(params[:id])
+    @user_attribute_model.update_attributes(params[:user_role_model])
+    
+    respond_to do |format|
+      format.html { redirect_to :action => :index }
+      format.js  { render 'admin/user_attribute_models/toggle_enable' }
+    end
+  end
+  
+  def destroy
+    @user_attribute_model = UserRoleModel.find(params[:id])
+    @user_attribute_model.destroy
+    
+    @user_attribute_model.destroy_i18n_variables
+    
+    redirect_to :action => :index
+  end
+  
+  protected
+  
+  def set_attribute
+    @attribute = 'role'
+	@class = 'roles'
+  end
+  
+end

app/controllers/admin/users_controller.rb

@@ -1,84 +1,89 @@
-class Admin::UsersController < ApplicationController
-  
-  layout "admin"
-  before_filter :authenticate_user!
-  
-  def index
-    @users = User.all.entries
-  end
-  
-  def show
-    @user = User.find(params[:id])
-    get_info_role_models
-  end
-  
-  def new
-    @user = User.new
-    get_info_role_models
-  end
-  
-  def create
-    @user = User.new(params[:user])
-    if @user.save
-      @user.user_infos.each do |info|
-        info.save
-        info.attribute_values.each(&:save)
-      end
-      @user.roles.each do |role|
-        role.save
-        role.attribute_values.each(&:save)
-      end
-      flash[:notice] = t('admin.create_success_user')
-      redirect_to :action => :index
-    else
-      render :action => :new      
-    end
-  end
-  
-  def edit
-    @user = User.find(params[:id])
-    get_info_role_models
-  end
-  
-  def update
-    @user = User.find(params[:id])
-    
-    # Update changes to the avatar
-    @user.remove_avatar! if params[:file]
-    @user.avatar = params[:file] if params[:file]
-    
-    if @user.id.to_s.eql?(session['warden.user.user.key'][1].to_s) && @user.admin != params[:user][:admin].to_i.to_b
-      flash.now[:error] = t('admin.cant_revoke_self_admin')
-    end
-    if !flash[:error] && @user.update_attributes(params[:user])
-      flash[:notice] = t('admin.update_success_user')
-      redirect_to :action => :index
-    else
-      get_info_role_models
-      render :action => :edit
-    end
-  end
-  
-  def destroy
-    if params[:id].eql?(session['warden.user.user.key'][1].to_s)
-      flash[:error] = t('admin.cant_delete_self')
-    else
-      @user = User.find(params[:id]) 
-      @user.destroy
-      @user.user_attributes.each do |ua|
-        ua.attribute_values.each(&:destroy)
-        ua.destroy
-      end
-    end
-    
-    redirect_to :action => :index
-  end
-  
-  protected
-  
-  def get_info_role_models
-    @roles = Info.excludes('disabled' => true)
-    @infos = Role.excludes('disabled' => true)
-  end
-  
-end
+class Admin::UsersController < ApplicationController
+  
+  layout "admin"
+  before_filter :authenticate_user!
+  before_filter :set_attribute, :only => [:index, :show, :new, :edit]
+  
+  def index
+    @users = User.all.entries
+  end
+  
+  def show
+    @user = User.find(params[:id])
+    get_info_role_models
+  end
+  
+  def new
+    @user = User.new
+    get_info_role_models
+  end
+  
+  def create
+    @user = User.new(params[:user])
+    if @user.save
+      @user.user_infos.each do |info|
+        info.save
+        info.attribute_values.each(&:save)
+      end
+      @user.roles.each do |role|
+        role.save
+        role.attribute_values.each(&:save)
+      end
+      flash[:notice] = t('admin.create_success_user')
+      redirect_to :action => :index
+    else
+      render :action => :new      
+    end
+  end
+  
+  def edit
+    @user = User.find(params[:id])
+    get_info_role_models
+  end
+  
+  def update
+    @user = User.find(params[:id])
+    
+    # Update changes to the avatar
+    @user.remove_avatar! if params[:file]
+    @user.avatar = params[:file] if params[:file]
+    
+    if @user.id.to_s.eql?(session['warden.user.user.key'][1].to_s) && @user.admin != params[:user][:admin].to_i.to_b
+      flash.now[:error] = t('admin.cant_revoke_self_admin')
+    end
+    if !flash[:error] && @user.update_attributes(params[:user])
+      flash[:notice] = t('admin.update_success_user')
+      redirect_to :action => :index
+    else
+      get_info_role_models
+      render :action => :edit
+    end
+  end
+  
+  def destroy
+    if params[:id].eql?(session['warden.user.user.key'][1].to_s)
+      flash[:error] = t('admin.cant_delete_self')
+    else
+      @user = User.find(params[:id]) 
+      @user.destroy
+      @user.user_attributes.each do |ua|
+        ua.attribute_values.each(&:destroy)
+        ua.destroy
+      end
+    end
+    
+    redirect_to :action => :index
+  end
+  
+  protected
+  
+  def get_info_role_models
+    @roles = Info.excludes('disabled' => true)
+    @infos = Role.excludes('disabled' => true)
+  end
+
+  def set_attribute
+    @class = 'users'
+  end
+  
+end