mirror of
https://github.com/casdoor/casdoor.git
synced 2025-05-23 02:35:49 +08:00
Improve permission, adapter page UI
This commit is contained in:
parent
d145ab780c
commit
4cc9137637
@ -227,7 +227,7 @@ class AdapterEditPage extends React.Component {
|
|||||||
</Row>
|
</Row>
|
||||||
<Row style={{marginTop: "20px"}} >
|
<Row style={{marginTop: "20px"}} >
|
||||||
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
<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>
|
||||||
<Col span={2} >
|
<Col span={2} >
|
||||||
<Button type={"primary"} onClick={() => {
|
<Button type={"primary"} onClick={() => {
|
||||||
|
@ -129,6 +129,13 @@ class AdapterListPage extends BaseListPage {
|
|||||||
{text: "Database", value: "Database"},
|
{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"),
|
title: i18next.t("provider:Host"),
|
||||||
dataIndex: "host",
|
dataIndex: "host",
|
||||||
@ -144,6 +151,12 @@ class AdapterListPage extends BaseListPage {
|
|||||||
width: "100px",
|
width: "100px",
|
||||||
sorter: true,
|
sorter: true,
|
||||||
...this.getColumnSearchProps("port"),
|
...this.getColumnSearchProps("port"),
|
||||||
|
render: (text, record, index) => {
|
||||||
|
if (text === 0) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return text;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: i18next.t("general:User"),
|
title: i18next.t("general:User"),
|
||||||
@ -161,13 +174,6 @@ class AdapterListPage extends BaseListPage {
|
|||||||
sorter: true,
|
sorter: true,
|
||||||
...this.getColumnSearchProps("password"),
|
...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"),
|
title: i18next.t("syncer:Database"),
|
||||||
dataIndex: "database",
|
dataIndex: "database",
|
||||||
|
@ -298,6 +298,13 @@ class PermissionListPage extends BaseListPage {
|
|||||||
filterMultiple: false,
|
filterMultiple: false,
|
||||||
width: "120px",
|
width: "120px",
|
||||||
sorter: true,
|
sorter: true,
|
||||||
|
render: (text, record, index) => {
|
||||||
|
return (
|
||||||
|
<Link to={`/users/${record.owner}/${encodeURIComponent(text)}`}>
|
||||||
|
{text}
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: i18next.t("permission:Approver"),
|
title: i18next.t("permission:Approver"),
|
||||||
@ -306,6 +313,13 @@ class PermissionListPage extends BaseListPage {
|
|||||||
filterMultiple: false,
|
filterMultiple: false,
|
||||||
width: "120px",
|
width: "120px",
|
||||||
sorter: true,
|
sorter: true,
|
||||||
|
render: (text, record, index) => {
|
||||||
|
return (
|
||||||
|
<Link to={`/users/${record.owner}/${encodeURIComponent(text)}`}>
|
||||||
|
{text}
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: i18next.t("permission:Approve time"),
|
title: i18next.t("permission:Approve time"),
|
||||||
|
@ -749,7 +749,7 @@ export function isMobile() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function getFormattedDate(date) {
|
export function getFormattedDate(date) {
|
||||||
if (date === undefined) {
|
if (!date) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user