mirror of
https://github.com/casdoor/casdoor.git
synced 2025-05-23 10:45:47 +08:00
Show resource list page to users.
This commit is contained in:
parent
f4a59de3a5
commit
e4846807cd
@ -85,6 +85,7 @@ p, *, *, GET, /api/get-user, *, *
|
|||||||
p, *, *, GET, /api/get-organizations, *, *
|
p, *, *, GET, /api/get-organizations, *, *
|
||||||
p, *, *, GET, /api/get-user-application, *, *
|
p, *, *, GET, /api/get-user-application, *, *
|
||||||
p, *, *, GET, /api/get-default-providers, *, *
|
p, *, *, GET, /api/get-default-providers, *, *
|
||||||
|
p, *, *, GET, /api/get-resources, *, *
|
||||||
p, *, *, POST, /api/upload-avatar, *, *
|
p, *, *, POST, /api/upload-avatar, *, *
|
||||||
p, *, *, POST, /api/unlink, *, *
|
p, *, *, POST, /api/unlink, *, *
|
||||||
p, *, *, POST, /api/set-password, *, *
|
p, *, *, POST, /api/set-password, *, *
|
||||||
|
@ -28,8 +28,9 @@ import (
|
|||||||
|
|
||||||
func (c *ApiController) GetResources() {
|
func (c *ApiController) GetResources() {
|
||||||
owner := c.Input().Get("owner")
|
owner := c.Input().Get("owner")
|
||||||
|
user := c.Input().Get("user")
|
||||||
|
|
||||||
c.Data["json"] = object.GetResources(owner)
|
c.Data["json"] = object.GetResources(owner, user)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,13 +38,14 @@ type Resource struct {
|
|||||||
Url string `xorm:"varchar(100)" json:"url"`
|
Url string `xorm:"varchar(100)" json:"url"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetResources(owner string) []*Resource {
|
func GetResources(owner string, user string) []*Resource {
|
||||||
if owner == "admin" {
|
if owner == "built-in" {
|
||||||
owner = ""
|
owner = ""
|
||||||
|
user = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
resources := []*Resource{}
|
resources := []*Resource{}
|
||||||
err := adapter.Engine.Desc("created_time").Find(&resources, &Resource{Owner: owner})
|
err := adapter.Engine.Desc("created_time").Find(&resources, &Resource{Owner: owner, User: user})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -321,6 +321,8 @@ class App extends Component {
|
|||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
res.push(
|
res.push(
|
||||||
<Menu.Item key="/resources">
|
<Menu.Item key="/resources">
|
||||||
<Link to="/resources">
|
<Link to="/resources">
|
||||||
@ -328,6 +330,8 @@ class App extends Component {
|
|||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (Setting.isAdminUser(this.state.account)) {
|
||||||
res.push(
|
res.push(
|
||||||
<Menu.Item key="/tokens">
|
<Menu.Item key="/tokens">
|
||||||
<Link to="/tokens">
|
<Link to="/tokens">
|
||||||
@ -343,6 +347,7 @@ class App extends Component {
|
|||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
res.push(
|
res.push(
|
||||||
<Menu.Item key="/swagger">
|
<Menu.Item key="/swagger">
|
||||||
<a target="_blank" rel="noreferrer" href={"/swagger"}>
|
<a target="_blank" rel="noreferrer" href={"/swagger"}>
|
||||||
@ -350,6 +355,7 @@ class App extends Component {
|
|||||||
</a>
|
</a>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
);
|
);
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ class ResourceListPage extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getResources() {
|
getResources() {
|
||||||
ResourceBackend.getResources("admin")
|
ResourceBackend.getResources(this.props.account.owner, this.props.account.name)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
this.setState({
|
this.setState({
|
||||||
resources: res,
|
resources: res,
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
|
|
||||||
import * as Setting from "../Setting";
|
import * as Setting from "../Setting";
|
||||||
|
|
||||||
export function getResources(owner) {
|
export function getResources(owner, user) {
|
||||||
return fetch(`${Setting.ServerUrl}/api/get-resources?owner=${owner}`, {
|
return fetch(`${Setting.ServerUrl}/api/get-resources?owner=${owner}&user=${user}`, {
|
||||||
method: "GET",
|
method: "GET",
|
||||||
credentials: "include"
|
credentials: "include"
|
||||||
}).then(res => res.json());
|
}).then(res => res.json());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user