Compare commits

...
9 Commits
2 changed files with 10 additions and 6 deletions
+9 -5
View File
@@ -196,6 +196,8 @@ export class CatalogController {
const dashboard = res.dashboard;
if (dashboard.owner === username) has_permission = true;
for (const role of user_roles) {
if (dashboard.p_roles.includes(role)) has_permission = true;
}
@@ -203,8 +205,8 @@ export class CatalogController {
if (dashboard.p_users.includes(user_id)) has_permission = true;
if (is_data_manager || has_permission) {
delete res[0].p_roles;
delete res[0].p_users;
delete dashboard.p_roles;
delete dashboard.p_users;
return res;
}
@@ -224,7 +226,7 @@ export class CatalogController {
user: user.user_id,
customer: user.customer_name,
});
const { user_id, customer_name, customer_id, permissions } = user;
const { user_id, customer_name, customer_id, permissions, username } = user;
const is_data_manager = permissions.includes(
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER.seqid,
);
@@ -248,6 +250,8 @@ export class CatalogController {
);
const table = res[0];
if (table.owner === username) has_permission = true;
for (const role of user_roles) {
if (table.p_roles.includes(role)) has_permission = true;
}
@@ -255,8 +259,8 @@ export class CatalogController {
if (table.p_users.includes(user_id)) has_permission = true;
if (is_data_manager || has_permission) {
delete res[0].p_roles;
delete res[0].p_users;
delete table.p_roles;
delete table.p_users;
return res;
}
+1 -1
View File
File diff suppressed because one or more lines are too long