Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…

…9.4.x Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Sep 26, 2023 · 0448af1 · 0448af1
2 parents a4c71a7 + 442ebef
commit 0448af1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/dali/base/dadfs.cpp b/dali/base/dadfs.cpp
@@ -1378,9 +1378,23 @@ static void checkLogicalScope(const char *scopename,IUserDescriptor *user,bool r
     SecAccessFlags perm = getScopePermissions(scopename,user,auditflags);
     IDFS_Exception *e = NULL;
     if (readreq&&!HASREADPERMISSION(perm))
-        e = new CDFS_Exception(DFSERR_LookupAccessDenied,scopename);
+    {
+        StringBuffer scopeDescription;
+        StringBuffer username("");
+        if (user)
+            user->getUserName(username);
+        scopeDescription.appendf("%s user '%s', assigned access %s (%d)", scopename, username.str(), getSecAccessFlagName(perm), perm);
+        e = new CDFS_Exception(DFSERR_LookupAccessDenied,scopeDescription);
+    }
     else if (createreq&&!HASWRITEPERMISSION(perm))
-        e = new CDFS_Exception(DFSERR_CreateAccessDenied,scopename);
+    {
+        StringBuffer scopeDescription;
+        StringBuffer username("");
+        if (user)
+            user->getUserName(username);
+        scopeDescription.appendf("%s user '%s', assigned access %s (%d)", scopename, username.str(), getSecAccessFlagName(perm), perm);
+        e = new CDFS_Exception(DFSERR_CreateAccessDenied,scopeDescription);
+    }
     if (e)
         throw e;
 }

diff --git a/esp/src/src-react/components/Files.tsx b/esp/src/src-react/components/Files.tsx
@@ -175,8 +175,8 @@ export const Files: React.FunctionComponent<FilesProps> = ({
                 },
             },
             Owner: { label: nlsHPCC.Owner },
-            SuperOwners: { label: nlsHPCC.SuperOwner },
-            Description: { label: nlsHPCC.Description },
+            SuperOwners: { label: nlsHPCC.SuperOwner, sortable: false },
+            Description: { label: nlsHPCC.Description, sortable: false },
             NodeGroup: { label: nlsHPCC.Cluster },
             Records: {
                 label: nlsHPCC.Records,

diff --git a/esp/src/src-react/components/Workunits.tsx b/esp/src/src-react/components/Workunits.tsx
@@ -144,7 +144,7 @@ export const Workunits: React.FunctionComponent<WorkunitsProps> = ({
             Owner: { label: nlsHPCC.Owner, width: 80 },
             Jobname: { label: nlsHPCC.JobName },
             Cluster: { label: nlsHPCC.Cluster },
-            RoxieCluster: { label: nlsHPCC.RoxieCluster },
+            RoxieCluster: { label: nlsHPCC.RoxieCluster, sortable: false },
             State: { label: nlsHPCC.State, width: 60 },
             TotalClusterTime: {
                 label: nlsHPCC.TotalClusterTime, width: 120,

diff --git a/esp/src/src-react/components/forms/AddToSuperfile.tsx b/esp/src/src-react/components/forms/AddToSuperfile.tsx
@@ -123,7 +123,7 @@ export const AddToSuperfile: React.FunctionComponent<AddToSuperfileProps> = ({
                     <table className={`${componentStyles.twoColumnTable} ${componentStyles.selectionTable}`}>
                         <thead>
                             <tr>
-                                <th>{nlsHPCC.TargetName}</th>
+                                <th>{nlsHPCC.LogicalName}</th>
                             </tr>
                         </thead>
                         <tbody>