new ui member bug and interface fix

app/controllers/admin/users_new_interface_controller.rb

@@ -1,6 +1,7 @@
 class Admin::UsersNewInterfaceController <  OrbitMemberController
 
   helper MemberHelper
+  helper OrbitBackendHelper
   
   before_filter :set_attribute,:except => [:index,:show]
   open_for_visitor :only => [:index, :show]
@@ -16,50 +17,64 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
 
 
     @filter = params[:filter]
-    new_filter = params[:new_filter]
+    @mq = params[:mq]
+    @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
+    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
-        @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]})
+        @filter.merge!({@new_filter[:type] => [@new_filter[:id].to_s]})
       end
-    elsif new_filter
-      @filter = {new_filter[:type] => [new_filter[:id].to_s]}
+    elsif @new_filter
+      @filter = {@new_filter[:type] => [@new_filter[:id].to_s]}
     end
 
-
     
 
-    if @filter.blank? 
+    if @filter.blank? and @mq.blank?
 
       render case params[:at]
         when 'summary'
-          @users=User.not_guest_user.page(page_num).per(12).asc("_id").includes('avatar')
+          @users=User.not_guest_user.page(page_num).per(12).desc("_id").includes('avatar')
           "index_summary"
         when 'thumbnail'
-          @users=User.not_guest_user.page(page_num).per(36).asc("_id").includes('avatar')
+          @users=User.not_guest_user.page(page_num).per(36).desc("_id").includes('avatar')
           "index_thumbnail"
         else
-          @users=User.not_guest_user.page(page_num).per(10).asc("_id").includes('avatar')
+          @users=User.not_guest_user.page(page_num).per(10).desc("_id").includes('avatar')
           "index"
       end
 
-    else
+    elsif @filter.blank? and !@mq.blank?
 
       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')
+          @users=User.not_guest_user.any_of({:user_id => /#{@mq}/i}, {:first_name => /#{@mq}/i}, {:last_name => /#{@mq}/i}, {:email => /#{@mq}/i}, {:office_tel => /#{@mq}/i}).desc("_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')
+          @users=User.not_guest_user.any_of({:user_id => /#{@mq}/i}, {:first_name => /#{@mq}/i}, {:last_name => /#{@mq}/i}, {:email => /#{@mq}/i}, {:office_tel => /#{@mq}/i}).desc("_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')
+          @users=User.not_guest_user.any_of({:user_id => /#{@mq}/i}, {:first_name => /#{@mq}/i}, {:last_name => /#{@mq}/i}, {:email => /#{@mq}/i}, {:office_tel => /#{@mq}/i}).desc("_id").includes('avatar')
+          "index"
+      end
+
+    elsif !@filter.blank? and @mq.blank?
+
+      render case params[:at]
+        when 'summary'
+          @users=User.not_guest_user.any_in(:role_ids=>@filter['role']).page(page_num).per(12).desc("_id").includes('avatar')
+          "index_summary"
+        when 'thumbnail'
+          @users=User.not_guest_user.any_in(:role_ids=>@filter['role']).page(page_num).per(36).desc("_id").includes('avatar')
+          "index_thumbnail"
+        else
+          @users=User.not_guest_user.any_in(:role_ids=>@filter['role']).page(page_num).per(10).desc("_id").includes('avatar')
           "index"
       end
 
@@ -215,7 +230,13 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
       @user.destroy
     end
     
-    redirect_to :action => :index
+    # redirect_to :action => :index
+    respond_to do |format|
+      format.html { redirect_to(admin_users_new_interface_index_url(:at=>params[:at])) }
+      # format.xml  { head :ok }
+      format.js
+    end
+
   end
   
   protected