user id set & user fields set & role set & member frontend list & user translation & create new member bug fix

app/controllers/admin/role_categorys_controller.rb

@@ -0,0 +1,9 @@
+class Admin::RoleCategorysController < Admin::RoleFiltersController
+
+  def initialize
+    super
+    @app_type = 'role_category'
+    @app_type_name = 'category'
+  end
+  
+end

app/controllers/admin/role_filters_controller.rb

@@ -0,0 +1,144 @@
+class Admin::RoleFiltersController < OrbitBackendController
+     
+  include OrbitControllerLib::DivisionForDisable
+
+  layout "new_admin"
+  
+  before_filter :authenticate_user!
+  before_filter :is_admin?
+  # before_filter :set_attribute, :only => [:index, :show, :new, :edit]
+  helper Admin::AttributeValuesViewHelper
+  
+  def index
+	  get_types
+	  @role = Role.find(params[:role_id])
+    @role_filters =  @types.where(:role_id=>params[:role_id])
+    @role_filter = @types.new(:display => 'List')
+	
+	# @url = admin_role_filter_role_filters_path
+
+    if @app_type == 'role_statuses'
+      @url = eval("admin_#{@app_type}_path")
+    else
+	    @url = eval("admin_#{@app_type}s_path")
+	  end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.js
+    end
+
+  end
+
+
+  def show
+  
+	  get_types
+	
+    @role_filter = @types.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.js
+    end
+  end
+
+
+  def new
+  
+	  get_types
+	
+    @role_filter = @types.new(:display => 'List')
+	
+	  @verb = :post
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.js
+    end
+  end
+  
+
+  def edit
+  
+	  get_types
+	
+    @role_filter = @types.find(params[:id])
+	
+	  @url = polymorphic_path([:admin, @role_filter])
+	
+	  @verb = :put
+
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+
+  def create
+    
+	  get_types
+	
+    @role_filter = @types.new(params[:role_filter])
+
+    respond_to do |format|
+      if @role_filter.save
+        format.html { redirect_to(admin_role_filter_url(params[:role_filter][:role_id])) }
+        format.js
+      end
+    end
+
+  end
+
+
+  def update
+  
+	  get_types
+	
+    @role_filter = @types.find(params[:id])
+	# debugger
+	# @url = admin_role_filter_role_filter_path(@role_filter)
+	# @url = eval("admin_role_filter_#{@app_type}_path(#{@role_filter})")
+	  @url = polymorphic_path([:admin, @role_filter])
+
+    respond_to do |format|
+      if @role_filter.update_attributes(params[:role_filter])
+        format.html { redirect_to(admin_role_filter_role_filters_url(params[:role_id]), :notice => t('role_filter.update_role_filter_success')) }
+        # format.xml  { head :ok }
+        format.js
+      else
+        format.html { render :action => "edit" }
+        format.js { render :action => "edit" }
+      end
+    end
+  end
+
+
+  def destroy
+  
+	  get_types
+	
+    @role_filter = @types.find(params[:id])
+    @role_filter.disable = @role_filter.disable ? false : true
+
+    if @role_filter.save!
+      respond_to do |format|
+        format.html { redirect_to(admin_role_filter_role_filters_url) }
+        # format.xml  { head :ok }
+        format.js
+      end      
+    else
+      flash[:error] = t("role_filter.update_failed")
+      format.html { render :action => "index" }
+    end
+
+  end
+  
+  protected
+  
+  def get_types
+    @types = @app_type.classify.constantize
+  end
+  
+end

app/controllers/admin/role_statuses_controller.rb

@@ -0,0 +1,9 @@
+class Admin::RoleStatusesController < Admin::RoleFiltersController
+
+  def initialize
+    super
+    @app_type = 'role_statuses'
+    @app_type_name = 'status'
+  end
+  
+end

app/controllers/admin/roles_controller.rb

@@ -17,35 +17,34 @@ class Admin::RolesController < OrbitBackendController
   
   def role_field
   
-	@field_name = 'role'
+	  @field_name = 'role'
 	
-	@attribute = Role.find(params[:role_id])
+	  @attribute = Role.find(params[:role_id])
 	
   end
   
   def sub_role
 	
-	@attribute = Role.find(params[:role_id])
-	@attribute_fields_upper_object = @attribute.sub_roles
-	
+	  @attribute = Role.find(params[:role_id])
+	  @attribute_fields_upper_object = @attribute.sub_roles
 	
   end
   
   def add_sub_role
 	
-	@attribute = Role.find(params[:role_id])
-	# @sub_attribute = Role.find(params[:role_id])
+	  @attribute = Role.find(params[:role_id])
+	  # @sub_attribute = Role.find(params[:role_id])
 	
-	@sub_attribute = SubRole.new
+	  @sub_attribute = SubRole.new
     @sub_attribute.role_id = params[:role_id]
   
   end
   
   def edit_sub_role
 	
-	@sub_attribute = SubRole.find(params[:role_id])
+	  @sub_attribute = SubRole.find(params[:role_id])
 	
-	@attribute = Role.find(@sub_attribute.role_id)
+	  @attribute = Role.find(@sub_attribute.role_id)
 	
     @sub_attribute.role_id = @sub_attribute.role_id
   
@@ -55,53 +54,52 @@ class Admin::RolesController < OrbitBackendController
   
     @field_name = 'sub_role'
 	
-	@sub_attribute = SubRole.find(params[:role_id])
+	  @sub_attribute = SubRole.find(params[:role_id])
 	
-	@attribute = Role.find(@sub_attribute.role_id)
+	  @attribute = Role.find(@sub_attribute.role_id)
 	
   end
   
   def add_attribute_field
 	
-	if params[:sub_role]
+	  if params[:sub_role]
 	
-	@field_name = 'sub_role'
+	    @field_name = 'sub_role'
 	
-	attribute = SubRole.find(params[:sub_role][:id]) rescue nil
-    @attribute_field_counter = attribute.attribute_fields.count
-    @attribute_field = attribute.attribute_fields.build
-    @attribute_field.save
+	    attribute = SubRole.find(params[:sub_role][:id]) rescue nil
+      @attribute_field_counter = attribute.attribute_fields.count
+      @attribute_field = attribute.attribute_fields.build
+      @attribute_field.save
 	
-    @attribute_field[:af_count] = @attribute_field_counter
+      @attribute_field[:af_count] = @attribute_field_counter
 	
-    @attribute = SubRole.find(params[:sub_role][:id])
+      @attribute = SubRole.find(params[:sub_role][:id])
 	
-	else
+	  else
 	
-	@field_name = 'role'
+	    @field_name = 'role'
 	
-    attribute = Role.find(params[:role_id]) rescue nil
-    @attribute_field_counter = attribute.attribute_fields.count
-    @attribute_field = attribute.attribute_fields.build
-    @attribute_field.save
+      attribute = Role.find(params[:role_id]) rescue nil
+      @attribute_field_counter = attribute.attribute_fields.count
+        @attribute_field = attribute.attribute_fields.build
+      @attribute_field.save
 	
-    @attribute_field[:af_count] = @attribute_field_counter
+      @attribute_field[:af_count] = @attribute_field_counter
 	
-    @attribute = Role.find(params[:role_id])
+      @attribute = Role.find(params[:role_id])
 	
-	end
+	  end
 	
-	respond_to do |format|
+	  respond_to do |format|
       format.js  { render 'add_attribute_field' }
-    end
-	
+    end	
 
   end
   
   def new
     @attribute = Role.new
 	
-	if !params[:parent_id]
+	  if !params[:parent_id]
       render :template => 'admin/attributes/new'
     end
 	
@@ -165,17 +163,17 @@ class Admin::RolesController < OrbitBackendController
   
   def destroy
     
-	if params[:sub_role]
+	  if params[:sub_role]
 	
-	  @sub_role = SubRole.find(params[:sub_role][:id])
+	    @sub_role = SubRole.find(params[:sub_role][:id])
 	  
       respond_to do |format|
         if @sub_role.destroy
-		  format.html { redirect_to(admin_role_sub_role_url(@sub_role.role_id)) }
+		      format.html { redirect_to(admin_role_sub_role_url(@sub_role.role_id)) }
         end
       end
 	  
-	else
+	  else
 	
       @attribute = Role.find(params[:id])
       @attribute.destroy

app/controllers/admin/users_new_interface_controller.rb

@@ -1,4 +1,6 @@
 class Admin::UsersNewInterfaceController <  OrbitBackendController
+
+  helper MemberHelper
   
   layout "new_admin"
   # before_filter :authenticate_user!
@@ -23,13 +25,13 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
     
     render case params[:at]
       when 'summary'
-        @users=User.not_guest_user.page(page_num).per(12).includes('avatar')
+        @users=User.not_guest_user.page(page_num).per(12).asc("_id").includes('avatar')
         "index_summary"
       when 'thumbnail'
-        @users=User.not_guest_user.page(page_num).per(36).includes('avatar')
+        @users=User.not_guest_user.page(page_num).per(36).asc("_id").includes('avatar')
         "index_thumbnail"
       else
-        @users=User.not_guest_user.page(page_num).per(10).includes('avatar')
+        @users=User.not_guest_user.page(page_num).per(10).asc("_id").includes('avatar')
         "index"
     end
   end
@@ -43,7 +45,7 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
     @student_data = []
     @staff_data = []
 
-    attribute_values = @user.attribute_values
+    attribute_values = @user.attribute_values.asc("_id")
     attribute_values.each{|att_val|
       @profile_data.push({:name => att_val.attribute_field.title,:value =>att_val.get_value_by_locale(I18n.locale.to_s)}) if att_val.attribute_field.attribute.key=="profile" rescue false
     }
@@ -80,21 +82,29 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
   end
   
   def create
-    puts params.to_yaml
+    # puts params.to_yaml
     # 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"])
+
+    @checkuser = User.where(:user_id => params[:user][:user_id]).first
+
+    if !@checkuser.blank?
+      flash.now[:error] = t("users.user_id_error")
+    end
+    
       # attribute_values.to_hash.each{|key,value|
       #   @user.attribute_values.build(value)
       # }
     # @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
     # binding.pry
-    if @user.save
+    if !flash.now[:error] && @user.save
       flash[:notice] = t('create.success.user')
       redirect_to :action => :index
     else
+      @user.attribute_values = nil
       @form_index = 0
-      render :action => :new      
+      render :action => :new , :notice => flash.now[:error]   
     end
   end
   
@@ -110,16 +120,46 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
     @form_index = 0
     get_info_and_roles
   end
+
+  def edit_passwd
+    # @disable_all_field = false
+    @user = User.find(params[:users_new_interface_id])
+  end
   
   def update
+
     @user = User.find(params[:id])
+
+    if params[:edit_type] == 'edit_passwd'
+
+      @checkuser = User.where(:user_id => params[:user][:user_id]).first
+
+      if !@checkuser.blank? &&  @checkuser.id != @user.id
+        flash.now[:error] = t("users.user_id_error")
+      elsif @user.admin && current_user.id == @user.id
+        flash.now[:error] = t("users.admin_change_password")
+      end
+
+      if !flash.now[:error] && @user.update_attributes(params[:user])
+        redirect_to :action => :show
+      else
+        render :action => :edit_passwd, :notice => flash.now[:error]
+      end
+
+    else
+
+      @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
+
+    end
+    
     
-    @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
     # @user.remove_avatar! if params[:file]
     # @user.avatar = params[:file] if params[:file]