use actual user

Author: XingY

api/src/org/labkey/api/query/QueryService.java

@@ -180,7 +180,7 @@ UserSchema createLinkedSchema(User user, Container container, String name, Strin
      * Returns custom views stored in the database (not module custom views) that meet the criteria. This is not appropriate
      * for UI operations (see getCustomViews() for that), but it's important for query change listeners. See #21641 and #21862.
      */
-    List<CustomView> getDatabaseCustomViews(@NotNull Container container, @Nullable String schemaName, @Nullable String queryName);
+    List<CustomView> getDatabaseCustomViews(@NotNull User user, @NotNull Container container, @Nullable String schemaName, @Nullable String queryName);
 
     int importCustomViews(User user, Container container, VirtualFile viewDir) throws IOException;
 

query/src/org/labkey/query/CustomViewQueryChangeListener.java

@@ -63,20 +63,20 @@ public void queryChanged(User user, Container container, ContainerFilter scope,
     {
         if (property.equals(QueryProperty.Name))
         {
-            _updateCustomViewQueryNameChange(container, schema, changes);
+            _updateCustomViewQueryNameChange(user, container, schema, changes);
         }
         if (property.equals(QueryProperty.SchemaName))
         {
-            _updateCustomViewSchemaNameChange(container, changes);
+            _updateCustomViewSchemaNameChange(user, container, changes);
         }
         if (property.equals(QueryProperty.ColumnType))
         {
-            _updateCustomViewColumnTypeChange(container, schema, changes);
+            _updateCustomViewColumnTypeChange(user, container, schema, changes);
         }
     }
 
 
-    private void _updateCustomViewColumnTypeChange(Container container, SchemaKey schema, @NotNull Collection<QueryPropertyChange<?>> changes)
+    private void _updateCustomViewColumnTypeChange(User user, Container container, SchemaKey schema, @NotNull Collection<QueryPropertyChange<?>> changes)
     {
         for (QueryPropertyChange<?> qpc : changes)
         {
@@ -93,7 +93,7 @@ private void _updateCustomViewColumnTypeChange(Container container, SchemaKey sc
 
             String columnName = newDp.getName() == null ? oldDp.getName() : newDp.getName();
 
-            List<CustomView> databaseCustomViews = QueryService.get().getDatabaseCustomViews(container, schema.toString(), queryName);
+            List<CustomView> databaseCustomViews = QueryService.get().getDatabaseCustomViews(user, container, schema.toString(), queryName);
 
             for (CustomView customView : databaseCustomViews)
             {
@@ -221,7 +221,7 @@ private String dependentViewMessage(Container container, CustomView view)
         return sb.toString();
     }
 
-    private void _updateCustomViewQueryNameChange(Container container, SchemaKey schemaKey, Collection<QueryPropertyChange<?>> changes)
+    private void _updateCustomViewQueryNameChange(User user, Container container, SchemaKey schemaKey, Collection<QueryPropertyChange<?>> changes)
     {
         // most property updates only care about the query name old value string and new value string
         Map<String, String> queryNameChangeMap = new CaseInsensitiveHashMap<>();
@@ -230,7 +230,7 @@ private void _updateCustomViewQueryNameChange(Container container, SchemaKey sch
             queryNameChangeMap.put((String)qpc.getOldValue(), (String)qpc.getNewValue());
         }
 
-        List<CustomView> databaseCustomViews = QueryService.get().getDatabaseCustomViews(container, schemaKey.toString(), null);
+        List<CustomView> databaseCustomViews = QueryService.get().getDatabaseCustomViews(user, container, schemaKey.toString(), null);
 
         for (CustomView customView : databaseCustomViews)
         {
@@ -262,7 +262,7 @@ private void _updateCustomViewQueryNameChange(Container container, SchemaKey sch
         }
     }
 
-    private void _updateCustomViewSchemaNameChange(Container container, Collection<QueryPropertyChange<?>> changes)
+    private void _updateCustomViewSchemaNameChange(User user, Container container, Collection<QueryPropertyChange<?>> changes)
     {
         Map<String, String> schemaNameChangeMap = new CaseInsensitiveHashMap<>();
         for (QueryPropertyChange<?> qpc : changes)
@@ -279,7 +279,7 @@ private void _updateCustomViewSchemaNameChange(Container container, Collection<Q
         {
             String newSchema = schemaNameChangeMap.get(oldSchema);
 
-            List<CustomView> databaseCustomViews = QueryService.get().getDatabaseCustomViews(container, oldSchema, null);
+            List<CustomView> databaseCustomViews = QueryService.get().getDatabaseCustomViews(user, container, oldSchema, null);
 
             for (CustomView customView : databaseCustomViews)
             {

query/src/org/labkey/query/QueryServiceImpl.java

@@ -1338,11 +1338,10 @@ public List<CustomView> getDatabaseCustomViews(@NotNull User user, Container con
     }
 
     @Override
-    public List<CustomView> getDatabaseCustomViews(@NotNull Container container, @Nullable String schemaName, @Nullable String queryName)
+    public List<CustomView> getDatabaseCustomViews(@NotNull User user, @NotNull Container container, @Nullable String schemaName, @Nullable String queryName)
     {
-        User searchUser = User.getSearchUser();
         // GitHub Issue 1058: Sample Finder saved views in subfolder break after MVTC to TC conversion
-        Collection<GUID> containerIds = container.getProductFoldersDataContainerFilter(searchUser).getIds();
+        Collection<GUID> containerIds = container.getProductFoldersDataContainerFilter(user).getIds();
 
         SimpleFilter filter = new SimpleFilter();
         if (containerIds != null)
@@ -1383,7 +1382,7 @@ public List<CustomView> getDatabaseCustomViews(@NotNull Container container, @Nu
                     UserSchema schema = schemas.get(cstmView.getSchema());
                     if (schema == null)
                     {
-                        schema = getUserSchema(searchUser, viewContainer, cstmView.getSchema());
+                        schema = getUserSchema(user, viewContainer, cstmView.getSchema());
                         schemas.put(cstmView.getSchema(), schema);
                     }
                     if (schema != null)