member for THU

app/controllers/admin/users_new_interface_controller.rb

@@ -33,19 +33,25 @@ class Admin::UsersNewInterfaceController < ApplicationController
     @student_data = []
     @staff_data = []
 
-    @user.attribute_values.each{|att_val|
+
+    attribute_values = @user.attribute_values.reject{|att_val|
+      # binding.pry if(att_val.id.to_s == '507fa1295789b52a540000e0')
+      !att_val.attribute_field.locale and  (att_val.attribute_field.neutral_for != I18n.locale.to_s)
+    }
+
+    attribute_values.each{|att_val|
       @profile_data.push({:name => att_val.attribute_field.title,:value =>att_val.get_value_by_locale(I18n.locale)}) if att_val.attribute_field.attribute.key=="profile" rescue false
     }
     
-    @user.attribute_values.each{|att_val|
+    attribute_values.each{|att_val|
       @teacher_data.push({:name => att_val.attribute_field.title,:value => att_val.get_value_by_locale(I18n.locale) }) if att_val.attribute_field.role.key=="teacher"rescue false
     }
 
-    @user.attribute_values.each{|att_val|
+    attribute_values.each{|att_val|
       @student_data.push({:name => att_val.attribute_field.title,:value => att_val.get_value_by_locale(I18n.locale) }) if att_val.attribute_field.role.key=="student"rescue false
     }
 
-    @user.attribute_values.each{|att_val|
+    attribute_values.each{|att_val|
       @staff_data.push({:name => att_val.attribute_field.title,:value => att_val.get_value_by_locale(I18n.locale) }) if att_val.attribute_field.role.key=="staff_data"rescue false
     }
 
@@ -75,19 +81,20 @@ class Admin::UsersNewInterfaceController < ApplicationController
   
   def new
     @user = User.new
+    @disable_all_field = true
     @form_index = 0
     get_info_and_roles
   end
   
   def create
     puts params.to_yaml
-    attribute_valuesp_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
-    attribute_values = params[:user].delete(attribute_valuesp_key)
-    # binding.pry
+    attribute_values_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
+    attribute_values = params[:user].delete(attribute_values_key)
     @user = User.new(params["user"])
       attribute_values.to_hash.each{|key,value|
         @user.attribute_values.build(value)
       }
+    @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
     if @user.save
       flash[:notice] = t('admin.create_success_user')
       redirect_to :action => :index
@@ -104,6 +111,7 @@ class Admin::UsersNewInterfaceController < ApplicationController
   end
 
   def edit
+    @disable_all_field = false
     @user = User.find(params[:id])
     @form_index = 0
     get_info_and_roles
@@ -112,6 +120,9 @@ class Admin::UsersNewInterfaceController < ApplicationController
   def update
     @user = User.find(params[:id])
     @user.update_attributes(params[:user])
+    attribute_values_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
+    attribute_values = params[:user].delete(attribute_values_key)
+    @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
     @user.save
     redirect_to :action => :show
     # # Update changes to the avatar