diff --git a/web/src/PermissionListPage.js b/web/src/PermissionListPage.js index ee595e95..298bbed4 100644 --- a/web/src/PermissionListPage.js +++ b/web/src/PermissionListPage.js @@ -139,7 +139,7 @@ class PermissionListPage extends BaseListPage { sorter: true, ...this.getColumnSearchProps("users"), render: (text, record, index) => { - return Setting.getTags(text); + return Setting.getTags(text, "users"); }, }, { @@ -150,7 +150,7 @@ class PermissionListPage extends BaseListPage { sorter: true, ...this.getColumnSearchProps("roles"), render: (text, record, index) => { - return Setting.getTags(text); + return Setting.getTags(text, "roles"); }, }, { diff --git a/web/src/RoleListPage.js b/web/src/RoleListPage.js index bf93b710..4c71229d 100644 --- a/web/src/RoleListPage.js +++ b/web/src/RoleListPage.js @@ -130,7 +130,7 @@ class RoleListPage extends BaseListPage { sorter: true, ...this.getColumnSearchProps("users"), render: (text, record, index) => { - return Setting.getTags(text); + return Setting.getTags(text, "users"); }, }, { @@ -141,7 +141,7 @@ class RoleListPage extends BaseListPage { sorter: true, ...this.getColumnSearchProps("roles"), render: (text, record, index) => { - return Setting.getTags(text); + return Setting.getTags(text, "roles"); }, }, { diff --git a/web/src/Setting.js b/web/src/Setting.js index 189bf7a9..14b24500 100644 --- a/web/src/Setting.js +++ b/web/src/Setting.js @@ -1070,18 +1070,28 @@ export function getTagColor(s) { return "processing"; } -export function getTags(tags) { +export function getTags(tags, urlPrefix = null) { const res = []; if (!tags) { return res; } tags.forEach((tag, i) => { - res.push( - - {tag} - - ); + if (urlPrefix === null) { + res.push( + + {tag} + + ); + } else { + res.push( + + + {tag} + + + ); + } }); return res; }