Merge with sub_roles

app/controllers/admin/users_controller.rb

@@ -10,25 +10,18 @@ class Admin::UsersController < ApplicationController
   
   def show
     @user = User.find(params[:id])
-    get_info_role_models
+    get_info_and_roles
   end
   
   def new
     @user = User.new
-    get_info_role_models
+    get_info_and_roles
   end
   
   def create
+    puts params.to_yaml
     @user = User.new(params[:user])
     if @user.save
-      @user.user_infos.each do |user_info|
-        user_info.save
-        user_info.attribute_values.each(&:save)
-      end
-      @user.user_roles.each do |user_role|
-        user_role.save
-        user_role.attribute_values.each(&:save)
-      end
       flash[:notice] = t('admin.create_success_user')
       redirect_to :action => :index
     else
@@ -38,7 +31,7 @@ class Admin::UsersController < ApplicationController
   
   def edit
     @user = User.find(params[:id])
-    get_info_role_models
+    get_info_and_roles
   end
   
   def update
@@ -55,7 +48,7 @@ class Admin::UsersController < ApplicationController
       flash[:notice] = t('admin.update_success_user')
       redirect_to :action => :index
     else
-      get_info_role_models
+      get_info_and_roles
       render :action => :edit
     end
   end
@@ -66,10 +59,6 @@ class Admin::UsersController < ApplicationController
     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
@@ -77,11 +66,11 @@ class Admin::UsersController < ApplicationController
   
   protected
   
-  def get_info_role_models
-    @user_info_models = UserInfoModel.excludes('disabled' => true)
-    @user_role_models = UserRoleModel.excludes('disabled' => true)
+  def get_info_and_roles
+    @infos = Info.excludes('disabled' => true)
+    @roles = Role.excludes('disabled' => true)
   end
-  
+
   def set_attribute
     @class = 'users'
   end