solved conflict for member_new_ui

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