llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 04:10:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add User.isGlobalAdmin

Browse Source
This commit is contained in:
Yang Luo
2021-02-15 22:14:19 +08:00
parent d44a5ee2c1
commit 60ad52f7ae
6 changed files with 96 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
object/init.go
View File

@ -31,20 +31,21 @@ func initBuiltInUser() {
}
user = &User{
Owner: "built-in",
Name: "admin",
CreatedTime: util.GetCurrentTime(),
Id: util.GenerateId(),
Password: "123",
PasswordType: "plain",
DisplayName: "Admin",
Avatar: "https://casbin.org/img/casbin.svg",
Email: "admin@example.com",
Phone: "1-12345678",
Affiliation: "Example Inc.",
Tag: "staff",
IsAdmin: true,
Github: "",
Owner: "built-in",
Name: "admin",
CreatedTime: util.GetCurrentTime(),
Id: util.GenerateId(),
Password: "123",
PasswordType: "plain",
DisplayName: "Admin",
Avatar: "https://casbin.org/img/casbin.svg",
Email: "admin@example.com",
Phone: "1-12345678",
Affiliation: "Example Inc.",
Tag: "staff",
IsAdmin: true,
IsGlobalAdmin: true,
Github: "",
}
AddUser(user)
}

21
object/user.go
View File

@ -24,16 +24,17 @@ type User struct {
Name string `xorm:"varchar(100) notnull pk" json:"name"`
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
Id string `xorm:"varchar(100)" json:"id"`
Password string `xorm:"varchar(100)" json:"password"`
PasswordType string `xorm:"varchar(100)" json:"passwordType"`
DisplayName string `xorm:"varchar(100)" json:"displayName"`
Avatar string `xorm:"varchar(100)" json:"avatar"`
Email string `xorm:"varchar(100)" json:"email"`
Phone string `xorm:"varchar(100)" json:"phone"`
Affiliation string `xorm:"varchar(100)" json:"affiliation"`
Tag string `xorm:"varchar(100)" json:"tag"`
IsAdmin bool `json:"isAdmin"`
Id string `xorm:"varchar(100)" json:"id"`
Password string `xorm:"varchar(100)" json:"password"`
PasswordType string `xorm:"varchar(100)" json:"passwordType"`
DisplayName string `xorm:"varchar(100)" json:"displayName"`
Avatar string `xorm:"varchar(100)" json:"avatar"`
Email string `xorm:"varchar(100)" json:"email"`
Phone string `xorm:"varchar(100)" json:"phone"`
Affiliation string `xorm:"varchar(100)" json:"affiliation"`
Tag string `xorm:"varchar(100)" json:"tag"`
IsAdmin bool `json:"isAdmin"`
IsGlobalAdmin bool `json:"isGlobalAdmin"`
Github string `xorm:"varchar(100)" json:"github"`
}

59
web/src/App.js
View File

@ -194,34 +194,37 @@ class App extends Component {
</Link>
</Menu.Item>
);
res.push(
<Menu.Item key="1">
<Link to="/organizations">
Organizations
</Link>
</Menu.Item>
);
res.push(
<Menu.Item key="2">
<Link to="/users">
Users
</Link>
</Menu.Item>
);
res.push(
<Menu.Item key="3">
<Link to="/providers">
Providers
</Link>
</Menu.Item>
);
res.push(
<Menu.Item key="4">
<Link to="/applications">
Applications
</Link>
</Menu.Item>
);
if (Setting.isAdminUser(this.state.account)) {
res.push(
<Menu.Item key="1">
<Link to="/organizations">
Organizations
</Link>
</Menu.Item>
);
res.push(
<Menu.Item key="2">
<Link to="/users">
Users
</Link>
</Menu.Item>
);
res.push(
<Menu.Item key="3">
<Link to="/providers">
Providers
</Link>
</Menu.Item>
);
res.push(
<Menu.Item key="4">
<Link to="/applications">
Applications
</Link>
</Menu.Item>
);
}
return res;
}

2
web/src/Setting.js
View File

@ -59,7 +59,7 @@ export function showMessage(type, text) {
}
export function isAdminUser(account) {
return account.owner === "built-in";
return account.owner === "built-in" || account.isGlobalAdmin === true;
}
export function deepCopy(obj) {

36
web/src/UserEditPage.js
View File

@ -216,16 +216,32 @@ class UserEditPage extends React.Component {
<Input value={this.state.user.github} disabled={true} />
</Col>
</Row>
<Row style={{marginTop: '20px'}} >
<Col style={{marginTop: '5px'}} span={2}>
Is Admin:
</Col>
<Col span={1} >
<Switch checked={this.state.user.isAdmin} onChange={checked => {
this.updateUserField('isAdmin', checked);
}} />
</Col>
</Row>
{
!Setting.isAdminUser(this.props.account) ? null : (
<React.Fragment>
<Row style={{marginTop: '20px'}} >
<Col style={{marginTop: '5px'}} span={2}>
Is Admin:
</Col>
<Col span={1} >
<Switch checked={this.state.user.isAdmin} onChange={checked => {
this.updateUserField('isAdmin', checked);
}} />
</Col>
</Row>
<Row style={{marginTop: '20px'}} >
<Col style={{marginTop: '5px'}} span={2}>
Is Global Admin:
</Col>
<Col span={1} >
<Switch checked={this.state.user.isGlobalAdmin} onChange={checked => {
this.updateUserField('isGlobalAdmin', checked);
}} />
</Col>
</Row>
</React.Fragment>
)
}
</Card>
)
}

12
web/src/UserListPage.js
View File

@ -208,6 +208,18 @@ class UserListPage extends React.Component {
)
}
},
{
title: 'Is Global Admin',
dataIndex: 'isGlobalAdmin',
key: 'isGlobalAdmin',
width: '120px',
sorter: (a, b) => a.isGlobalAdmin.localeCompare(b.isGlobalAdmin),
render: (text, record, index) => {
return (
<Switch disabled checkedChildren="ON" unCheckedChildren="OFF" checked={text} />
)
}
},
{
title: 'Action',
dataIndex: '',