llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-22 18:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve permission, adapter page UI

Browse Source
This commit is contained in:
Yang Luo 2023-09-24 09:56:06 +08:00
parent d145ab780c
commit 4cc9137637
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/AdapterEditPage.js
View File

@ -227,7 +227,7 @@ class AdapterEditPage extends React.Component {
</Row>
<Row style={{marginTop: "20px"}} >
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
{Setting.getLabel(i18next.t("provider:DB Test"), i18next.t("provider:DB Test - Tooltip"))} :
{Setting.getLabel(i18next.t("provider:DB test"), i18next.t("provider:DB test - Tooltip"))} :
</Col>
<Col span={2} >
<Button type={"primary"} onClick={() => {

20
web/src/AdapterListPage.js
View File

@ -129,6 +129,13 @@ class AdapterListPage extends BaseListPage {
{text: "Database", value: "Database"},
],
},
{
title: i18next.t("syncer:Database type"),
dataIndex: "databaseType",
key: "databaseType",
width: "120px",
sorter: (a, b) => a.databaseType.localeCompare(b.databaseType),
},
{
title: i18next.t("provider:Host"),
dataIndex: "host",
@ -144,6 +151,12 @@ class AdapterListPage extends BaseListPage {
width: "100px",
sorter: true,
...this.getColumnSearchProps("port"),
render: (text, record, index) => {
if (text === 0) {
return "";
}
return text;
},
},
{
title: i18next.t("general:User"),
@ -161,13 +174,6 @@ class AdapterListPage extends BaseListPage {
sorter: true,
...this.getColumnSearchProps("password"),
},
{
title: i18next.t("syncer:Database type"),
dataIndex: "databaseType",
key: "databaseType",
width: "120px",
sorter: (a, b) => a.databaseType.localeCompare(b.databaseType),
},
{
title: i18next.t("syncer:Database"),
dataIndex: "database",

14
web/src/PermissionListPage.js
View File

@ -298,6 +298,13 @@ class PermissionListPage extends BaseListPage {
filterMultiple: false,
width: "120px",
sorter: true,
render: (text, record, index) => {
return (
<Link to={`/users/${record.owner}/${encodeURIComponent(text)}`}>
{text}
</Link>
);
},
},
{
title: i18next.t("permission:Approver"),
@ -306,6 +313,13 @@ class PermissionListPage extends BaseListPage {
filterMultiple: false,
width: "120px",
sorter: true,
render: (text, record, index) => {
return (
<Link to={`/users/${record.owner}/${encodeURIComponent(text)}`}>
{text}
</Link>
);
},
},
{
title: i18next.t("permission:Approve time"),

2
web/src/Setting.js
View File

@ -749,7 +749,7 @@ export function isMobile() {
}
export function getFormattedDate(date) {
if (date === undefined) {
if (!date) {
return null;
}