solved conflict for member_new_ui

app/controllers/admin/infos_controller.rb

@@ -1,4 +1,4 @@
-class Admin::InfosController < OrbitBackendController
+class Admin::InfosController < OrbitMemberController
   
   before_filter :authenticate_user!
   before_filter :is_admin?

app/controllers/admin/role_filters_controller.rb

@@ -1,8 +1,8 @@
-class Admin::RoleFiltersController < OrbitBackendController
+class Admin::RoleFiltersController < OrbitMemberController
      
   include OrbitControllerLib::DivisionForDisable
 
-  layout "new_admin"
+  # layout "new_admin"
   
   before_filter :authenticate_user!
   before_filter :is_admin?
@@ -49,13 +49,22 @@ class Admin::RoleFiltersController < OrbitBackendController
 	  get_types
 	
     @role_filter = @types.new(:display => 'List')
+  
+    # @url = polymorphic_path([:admin, @role_filter])
+
+    if @app_type == 'role_statuses'
+      @url = eval("admin_#{@app_type}_path(:role_id=>params[:role_id])")
+    else
+      @url = eval("admin_#{@app_type}s_path(:role_id=>params[:role_id])")
+    end
 	
 	  @verb = :post
 
-    respond_to do |format|
-      format.html # new.html.erb
-      format.js
-    end
+    render layout: false
+    # respond_to do |format|
+    #   format.html # new.html.erb
+    #   format.js
+    # end
   end
   
 
@@ -69,12 +78,13 @@ class Admin::RoleFiltersController < OrbitBackendController
 	
 	  @verb = :put
 
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
+    render layout: false
 
+    # respond_to do |format|
+    #   format.html
+    #   format.js
+    # end
+  end
 
   def create
     
@@ -82,11 +92,18 @@ class Admin::RoleFiltersController < OrbitBackendController
 	
     @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
+    if @app_type == 'role_statuses'
+      @url = eval("admin_#{@app_type}_path(:role_id=>params[:role_filter][:role_id])")
+    else
+      @url = eval("admin_#{@app_type}s_path(:role_id=>params[:role_filter][:role_id])")
+    end
+
+    if @role_filter.save
+      redirect_to @url
+    else
+      @role_filter = @types.new(params[:role_filter])
+      flash.now[:error] = t('create.error.category')
+      render action: :new
     end
 
   end
@@ -102,16 +119,21 @@ class Admin::RoleFiltersController < OrbitBackendController
 	# @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
+    if @app_type == 'role_statuses'
+      @url = eval("admin_#{@app_type}_path(:role_id=>@role_filter.role_id)")
+    else
+      @url = eval("admin_#{@app_type}s_path(:role_id=>@role_filter.role_id)")
     end
+
+
+    @role_filter = @types.find(params[:id])
+    if @role_filter.update_attributes(params[:role_filter])
+      redirect_to @url
+    else
+      flash.now[:error] = t('update.error.category')
+      render action: :edit
+    end
+
   end
 
 
@@ -134,6 +156,26 @@ class Admin::RoleFiltersController < OrbitBackendController
     end
 
   end
+
+  def toggle
+  
+    get_types
+    
+    if @app_type == 'role_statuses'
+      @role_filter = @types.find(params[:role_status_id])
+      @url = eval("admin_#{@app_type}_path(:role_id=>@role_filter.role_id)")
+    else
+      @role_filter = @types.find(params[:role_category_id])
+      @url = eval("admin_#{@app_type}s_path(:role_id=>@role_filter.role_id)")
+    end
+
+    @role_filter.disable = @role_filter.disable ? false : true
+
+    @role_filter.save!
+
+    redirect_to @url
+
+  end
   
   protected
   

app/controllers/admin/roles_controller.rb

@@ -1,4 +1,4 @@
-class Admin::RolesController < OrbitBackendController
+class Admin::RolesController < OrbitMemberController
   
   before_filter :authenticate_user!
   before_filter :is_admin?
@@ -6,7 +6,7 @@ class Admin::RolesController < OrbitBackendController
   helper Admin::AttributeValuesViewHelper
 
   def index
-    @attributes = Role.all.entries
+    @attributes = Role.all.asc("_id").entries
     render :template => 'admin/attributes/index'
   end
   
@@ -36,7 +36,7 @@ class Admin::RolesController < OrbitBackendController
 	
 	  @sub_attribute = SubRole.new
     @sub_attribute.role_id = params[:role_id]
-  
+    render layout: false
   end
   
   def edit_sub_role
@@ -46,7 +46,7 @@ class Admin::RolesController < OrbitBackendController
 	  @attribute = Role.find(@sub_attribute.role_id)
 	
     @sub_attribute.role_id = @sub_attribute.role_id
-  
+    render layout: false
   end
   
   def sub_role_field
@@ -94,20 +94,50 @@ class Admin::RolesController < OrbitBackendController
     end	
 
   end
+
+  # def get_variables_for_new
+  #   @designs = Design.all.entries
+  #   @themes = Design.first.themes
+  #   @module_apps = ModuleApp.for_frontend_select
+  #   @app_frontend_urls = nil
+  #   @categories = nil
+  #   @tags = nil
+  #   @page_frontend_data_counts = nil
+  #   @frontend_styles = nil
+  #   @selected={
+  #     :design => @designs.first,
+  #     :theme=> @themes.first,
+  #     :module_app=>nil,#@module_apps.first
+  #     :app_frontend_url=> nil, #@module_apps.first
+  #     :category=>nil,
+  #     :tag=>nil,
+  #     :page_frontend_data_count=>nil,
+  #     :frontend_style => nil
+  #   }
+  # end
+
+  # def new
+  #   @item = Page.new(params[:page])
+  #   @item.parent = Item.find(params[:parent_id]) rescue nil
+  #   get_variables_for_new
+  #   render layout: false
+  # end
+
   
   def new
     @attribute = Role.new
 	
-	  if !params[:parent_id]
-      render :template => 'admin/attributes/new'
-    end
-	
+	  # if !params[:parent_id]
+   #    render :template => 'admin/attributes/new'
+   #  end
+	  render layout: false
   end
   
   def edit
     @attribute = Role.find(params[:id])
     @attribute_fields_upper_object = @attribute.sub_roles
-    render :template => 'admin/attributes/edit'
+    # render :template => 'admin/attributes/edit'
+    render layout: false
   end
   
   def create
@@ -118,18 +148,28 @@ class Admin::RolesController < OrbitBackendController
 	  
       # @sub_role.role_id = params[:id]
 
-      respond_to do |format|
-        if @sub_role.save
-          format.html { redirect_to(admin_role_sub_role_url(params[:sub_role][:role_id])) }
-        end
+
+      if @sub_role.save
+        redirect_to admin_role_sub_role_url(params[:sub_role][:role_id])
+      else
+        @sub_role = SubRole.new(params[:sub_role])
+        flash.now[:error] = t('create.error.category')
+        render action: :new
       end
 	  
-	else
+	  else
 
       @attribute = Role.new(params[:role])
-      @attribute.save
-      redirect_to :action => :index
-	  
+     #  if @attribute.save
+     #    redirect_to :action => :index
+	    # end
+      if @attribute.save
+        redirect_to admin_roles_url
+      else
+        @attribute = Role.new(params[:role])
+        flash.now[:error] = t('create.error.category')
+        render action: :new
+      end
     end
 	
   end
@@ -139,21 +179,35 @@ class Admin::RolesController < OrbitBackendController
     if params[:sub_role]
 
       @sub_role = SubRole.find(params[:sub_role][:id])
-      @sub_role.update_attributes(params[:sub_role])
-      @sub_role.attribute_fields.each{|t| t.destroy if t["to_delete"] == true}
-      respond_to do |format|
-        format.html { redirect_to(admin_role_sub_role_url(@sub_role.role_id)) }
-        format.js  { render 'toggle_enable' }
+      if @sub_role.update_attributes(params[:sub_role])
+        @sub_role.attribute_fields.each{|t| t.destroy if t["to_delete"] == true}
+      # respond_to do |format|
+      #   format.html { redirect_to(admin_role_sub_role_url(@sub_role.role_id)) }
+      #   format.js  { render 'toggle_enable' }
+      # end
+
+        redirect_to admin_role_sub_role_url(@sub_role.role_id)
+      else
+        flash.now[:error] = t('update.error.category')
+        render action: :edit
       end
 	  
-	else
+	  else
 
       @attribute = Role.find(params[:id])
-      @attribute.update_attributes(params[:role])
-      @attribute.attribute_fields.each{|t| t.destroy if t["to_delete"] == true}
-      respond_to do |format|
-        format.html { redirect_to :action => :index }
-        format.js  { render 'admin/attributes/toggle_enable' }
+      # @attribute.update_attributes(params[:role])
+      # @attribute.attribute_fields.each{|t| t.destroy if t["to_delete"] == true}
+      # respond_to do |format|
+      #   format.html { redirect_to :action => :index }
+      #   format.js  { render 'admin/attributes/toggle_enable' }
+      # end
+
+      if @attribute.update_attributes(params[:role])
+        @attribute.attribute_fields.each{|t| t.destroy if t["to_delete"] == true}
+        redirect_to admin_roles_url
+      else
+        flash.now[:error] = t('update.error.category')
+        render action: :edit
       end
 	  
     end
@@ -164,11 +218,12 @@ class Admin::RolesController < OrbitBackendController
     
 	  if params[:sub_role]
 	
-	    @sub_role = SubRole.find(params[:sub_role][:id])
+	    @attribute = 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)) }
+        if @attribute.destroy
+		      format.html { redirect_to(admin_role_sub_role_url(@attribute.role_id)) }
+          format.js 
         end
       end
 	  
@@ -176,11 +231,32 @@ class Admin::RolesController < OrbitBackendController
 	
       @attribute = Role.find(params[:id])
       @attribute.destroy
-      redirect_to :action => :index
-	
+	    respond_to do |format|
+        format.html { redirect_to admin_roles_url }
+        format.js  { render 'admin/attributes/destroy' }
+      end
     end
 	
   end
+
+  def toggle
+    @attribute = Role.find(params[:role_id])
+    @attribute.disabled = @attribute.disabled ? false : true
+    @attribute.save!
+    redirect_to action: :index 
+  end
+
+  def sub_role_toggle
+  
+    @sub_attribute = SubRole.find(params[:role_id])
+
+    @sub_attribute.disabled = @sub_attribute.disabled ? false : true
+    @sub_attribute.save!
+
+    redirect_to admin_role_sub_role_url(@sub_attribute.role_id)
+
+  end
+
   
   protected
   

app/controllers/admin/users_new_interface_controller.rb

@@ -1,4 +1,4 @@
-class Admin::UsersNewInterfaceController <  OrbitBackendController
+class Admin::UsersNewInterfaceController <  OrbitMemberController
 
   helper MemberHelper
   
@@ -19,20 +19,62 @@ class Admin::UsersNewInterfaceController <  OrbitBackendController
     get_tags
     get_sub_roles
 
+    @roles = Role.excludes('disabled' => true).asc("_id")
+
     page_num = params[:page] || 1
     @users = []
-    
-    render case params[:at]
-      when 'summary'
-        @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).asc("_id").includes('avatar')
-        "index_thumbnail"
+
+
+    @filter = params[:filter]
+    new_filter = params[:new_filter]
+
+    if @filter && params[:clear]
+      @filter.delete(params[:type])
+    elsif @filter && new_filter
+      if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s)
+        @filter[new_filter[:type]].delete(new_filter[:id].to_s)
+      elsif @filter.has_key?(new_filter[:type])
+        @filter[new_filter[:type]] << new_filter[:id].to_s
       else
-        @users=User.not_guest_user.page(page_num).per(10).asc("_id").includes('avatar')
-        "index"
+        @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]})
+      end
+    elsif new_filter
+      @filter = {new_filter[:type] => [new_filter[:id].to_s]}
     end
+
+
+    
+
+    if @filter.blank? 
+
+      render case params[:at]
+        when 'summary'
+          @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).asc("_id").includes('avatar')
+          "index_thumbnail"
+        else
+          @users=User.not_guest_user.page(page_num).per(10).asc("_id").includes('avatar')
+          "index"
+      end
+
+    else
+
+      render case params[:at]
+        when 'summary'
+          @users=User.not_guest_user.any_in(:role_ids=>@filter['role']).page(page_num).per(12).asc("_id").includes('avatar')
+          "index_summary"
+        when 'thumbnail'
+          @users=User.not_guest_user.any_in(:role_ids=>@filter['role']).page(page_num).per(36).asc("_id").includes('avatar')
+          "index_thumbnail"
+        else
+          @users=User.not_guest_user.any_in(:role_ids=>@filter['role']).page(page_num).per(10).asc("_id").includes('avatar')
+          "index"
+      end
+
+    end
+    
   end
   
   def show