[ARVADOS] updated: 1.3.0-3-g79bc7fbc9

Git user git at public.curoverse.com
Tue Dec 4 10:54:19 EST 2018


Summary of changes:
 services/api/app/models/arvados_model.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

       via  79bc7fbc9581c5ee89be4dd23bc01e8713a1ddee (commit)
      from  37d8512b93cff033af35935b918deaaf6c353bce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 79bc7fbc9581c5ee89be4dd23bc01e8713a1ddee
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Dec 4 10:43:01 2018 -0500

    14576: Adjust query for admins that filters out trashed items
    
    refs #14576
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 4e7f8f0bf..30c4c486e 100644
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -274,9 +274,8 @@ class ArvadosModel < ActiveRecord::Base
       if !include_trash
         if sql_table != "api_client_authorizations"
           # Only include records where the owner is not trashed
-          sql_conds = "NOT EXISTS(SELECT 1 FROM #{PERMISSION_VIEW} "+
-                      "WHERE trashed = 1 AND "+
-                      "(#{sql_table}.owner_uuid = target_uuid)) #{exclude_trashed_records}"
+          sql_conds = "#{sql_table}.owner_uuid NOT IN (SELECT target_uuid FROM #{PERMISSION_VIEW} "+
+                      "WHERE trashed = 1) #{exclude_trashed_records}"
         end
       end
     else

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list