5010: remove_items sets the expired_at date if available

[arvados.git] / apps / workbench / app / controllers / search_controller.rb

diff --git a/apps/workbench/app/controllers/search_controller.rb b/apps/workbench/app/controllers/search_controller.rb
index 31c66638db69986ddb578740896f67f3be841351..9e2ff1b00b7e38c31129a3694833023aaebbc825 100644 (file)
--- a/apps/workbench/app/controllers/search_controller.rb
+++ b/apps/workbench/app/controllers/search_controller.rb
@@ -6,7 +6,12 @@ class SearchController < ApplicationController
       @filters = @filters.select do |attr, operator, operand|
         not (attr == 'owner_uuid' and operator == '=')
       end
-      search_what = Group.find(params[:project_uuid])
+      # Special case for project_uuid is a user uuid:
+      if ArvadosBase::resource_class_for_uuid(params[:project_uuid]) == User
+        search_what = User.find params[:project_uuid]
+      else
+        search_what = Group.find params[:project_uuid]
+      end
     end
     @objects = search_what.contents(limit: @limit,
                                     offset: @offset,
@@ -16,6 +21,8 @@ class SearchController < ApplicationController
   end
 
   def next_page_href with_params={}
-    super with_params.merge(last_object_class: @objects.last.class.to_s)
+    super with_params.merge(last_object_class: @objects.last.class.to_s,
+                            project_uuid: params[:project_uuid],
+                            filters: @filters.to_json)
   end
 end