diff --git a/authz/authz.go b/authz/authz.go index bd60bdd1..1e27d267 100644 --- a/authz/authz.go +++ b/authz/authz.go @@ -85,6 +85,7 @@ p, *, *, GET, /api/get-user, *, * p, *, *, GET, /api/get-organizations, *, * p, *, *, GET, /api/get-user-application, *, * p, *, *, GET, /api/get-default-providers, *, * +p, *, *, GET, /api/get-resources, *, * p, *, *, POST, /api/upload-avatar, *, * p, *, *, POST, /api/unlink, *, * p, *, *, POST, /api/set-password, *, * diff --git a/controllers/resource.go b/controllers/resource.go index e0db9a4d..412393cb 100644 --- a/controllers/resource.go +++ b/controllers/resource.go @@ -28,8 +28,9 @@ import ( func (c *ApiController) GetResources() { 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() } diff --git a/object/resource.go b/object/resource.go index 05a51c53..31d24b0f 100644 --- a/object/resource.go +++ b/object/resource.go @@ -38,13 +38,14 @@ type Resource struct { Url string `xorm:"varchar(100)" json:"url"` } -func GetResources(owner string) []*Resource { - if owner == "admin" { +func GetResources(owner string, user string) []*Resource { + if owner == "built-in" { owner = "" + user = "" } 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 { panic(err) } diff --git a/web/src/App.js b/web/src/App.js index 376e4ee5..f34b6bd6 100644 --- a/web/src/App.js +++ b/web/src/App.js @@ -321,13 +321,17 @@ class App extends Component { ); - res.push( -