3444: Remove support for obsolete group_class=folder

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index df57e9e71fa85396d95ee35ed887b466f7d3fb9d..df95335cb83975f6cb04a31bb46bc21160fced76 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -577,7 +577,7 @@ class ApplicationController < ActionController::Base
   helper_method :all_projects
   def all_projects
     @all_projects ||= Group.
-      filter([['group_class','in',['project','folder']]]).order('name')
+      filter([['group_class','=','project']]).order('name')
   end
 
   helper_method :my_projects
@@ -688,7 +688,7 @@ class ApplicationController < ActionController::Base
     crumbs = []
     current = @name_link || @object
     while current
-      if current.is_a?(Group) and current.group_class.in?(['project','folder'])
+      if current.is_a?(Group) and current.group_class == 'project'
         crumbs.prepend current
       end
       if current.is_a? Link
@@ -702,7 +702,7 @@ class ApplicationController < ActionController::Base
 
   helper_method :current_project_uuid
   def current_project_uuid
-    if @object.is_a? Group and @object.group_class.in?(['project','folder'])
+    if @object.is_a? Group and @object.group_class == 'project'
       @object.uuid
     elsif @name_link.andand.tail_uuid
       @name_link.tail_uuid

diff --git a/apps/workbench/app/controllers/groups_controller.rb b/apps/workbench/app/controllers/groups_controller.rb
index 7698fdba934cb68e641ea23d7ffe92635aa09ffd..080386ea5c6bf6185bcd57e744014203e4060be8 100644 (file)
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,6 +1,6 @@
 class GroupsController < ApplicationController
   def index
-    @groups = Group.filter [['group_class', 'not in', ['folder', 'project']]]
+    @groups = Group.filter [['group_class', '!=', 'project']]
     @group_uuids = @groups.collect &:uuid
     @links_from = Link.where link_class: 'permission', tail_uuid: @group_uuids
     @links_to = Link.where link_class: 'permission', head_uuid: @group_uuids
@@ -8,7 +8,7 @@ class GroupsController < ApplicationController
   end
 
   def show
-    if @object.group_class.in?(['project','folder'])
+    if @object.group_class == 'project'
       redirect_to(project_path(@object))
     else
       super

diff --git a/apps/workbench/app/models/group.rb b/apps/workbench/app/models/group.rb
index 30488c3383b812bb7ffc32dbec524bdb88c1c2cf..558c587a1c9c83d3a0bb824475e0b8f2553e4a0d 100644 (file)
--- a/apps/workbench/app/models/group.rb
+++ b/apps/workbench/app/models/group.rb
@@ -22,7 +22,7 @@ class Group < ArvadosBase
   end
 
   def class_for_display
-    group_class.in?(['folder', 'project']) ? 'Project' : super
+    group_class == 'project' ? 'Project' : super
   end
 
   def editable?

diff --git a/apps/workbench/app/views/application/_content_layout.html.erb b/apps/workbench/app/views/application/_content_layout.html.erb
index c8e38277201b7a465fcc53a1f7b82556d7c18f31..519e8853f3bd77a10b6e28bc8cb0cafcb3d6bb24 100644 (file)
--- a/apps/workbench/app/views/application/_content_layout.html.erb
+++ b/apps/workbench/app/views/application/_content_layout.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :content_top %>
-  <% if @object and @object.is_a?(Group) and @object.group_class.in?(['project','folder']) %>
+  <% if @object and @object.is_a?(Group) and @object.group_class == 'project' %>
   <div class="pull-right">
     <%= content_for :tab_line_buttons %>
   </div>

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index e7d5530088c9e19a905d074e4d05122a083fa7fa..f51f37aedbd29fcfb17558a6f9af1b852a053a2b 100644 (file)
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -64,7 +64,7 @@ class Arvados::V1::GroupsController < ApplicationController
      Human, Specimen, Trait].each do |klass|
       @objects = klass.readable_by(*@read_users)
       if klass == Group
-        @objects = @objects.where('group_class in (?)', ['project', 'folder'])
+        @objects = @objects.where(group_class: 'project')
       end
       if opts[:owner_uuid]
         conds = []

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 2d0c76f09d8c663f03cd01df0dce351af1f9cee8..aa05031fe0ec8c45a73d1fd41320f1c3913e10d5 100644 (file)
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -3,6 +3,7 @@
 --
 
 SET statement_timeout = 0;
+SET lock_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SET check_function_bodies = false;

diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index 5eeca0770c0cbdef9b042e641edd6feaafaedc1a..c02da121e716c171917d2b9ea7d0accfde5f8c7d 100644 (file)
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -16,11 +16,11 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
 
   test "get list of projects" do
     authorize_with :active
-    get :index, filters: [['group_class', 'in', ['project', 'folder']]], format: :json
+    get :index, filters: [['group_class', '=', 'project']], format: :json
     assert_response :success
     group_uuids = []
     json_response['items'].each do |group|
-      assert_includes ['folder', 'project'], group['group_class']
+      assert_equal 'project', group['group_class']
       group_uuids << group['uuid']
     end
     assert_includes group_uuids, groups(:aproject).uuid