Daniel Lee
ebcbcdc27a
dashfolders: inherited permissions for dashboards
...
Allow duplicate permissions if the original is an
inherited permission from a parent folder.
If a dashboard has permissions but the parent folder
does not, return the default permissions for the
editor and view role combined with the permissions
for the child dashboard.
2017-06-24 03:50:22 +02:00
Daniel Lee
86a7266f5f
dashfolders: handle permission changes when saving/moving dashboards
2017-06-23 23:31:58 +02:00
Torkel Ödegaard
3066280216
added code from #8504 , and #8021
2017-06-23 17:13:58 -04:00
Torkel Ödegaard
1833c65559
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-06-23 16:07:16 -04:00
Torkel Ödegaard
fc69d59cae
dashboard folder search fix
2017-06-23 16:00:26 -04:00
Daniel Lee
01ac3a49bd
dashfolders: fix user group picker + cleanup
2017-06-23 20:56:02 +02:00
Torkel Ödegaard
9c6c8c0f3f
acl fixes
2017-06-22 17:10:43 -04:00
Torkel Ödegaard
f6b52cd6d7
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
2017-06-22 15:16:57 -04:00
Torkel Ödegaard
a82b25eb79
acl: more acl work
2017-06-22 15:16:41 -04:00
Daniel Lee
46c5625b59
dashfolders: filter search based on child dash permissions
2017-06-22 20:10:49 +02:00
Torkel Ödegaard
659a59107e
dashboard acl stuff
2017-06-21 19:23:24 -04:00
Torkel Ödegaard
2257c1f874
dashboard acl work
2017-06-21 19:02:03 -04:00
Torkel Ödegaard
48305b5789
dashboard acl
2017-06-21 14:19:08 -04:00
Torkel Ödegaard
fcc8557dbb
dashboard acl work
2017-06-21 14:11:16 -04:00
Torkel Ödegaard
212a66ae5f
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
2017-06-19 18:55:34 -04:00
Torkel Ödegaard
93bc588dae
refactoring: moving dashboards acl migrations to its own folder
2017-06-19 18:48:15 -04:00
Daniel Lee
812112f2f6
WIP: fix acl route
2017-06-20 00:34:25 +02:00
Torkel Ödegaard
e290015887
refactoring: renaming
2017-06-19 18:19:58 -04:00
Torkel Ödegaard
aaf2a897b0
folders: changed api urls for dashboard acls
2017-06-19 18:11:30 -04:00
Torkel Ödegaard
c4a1803060
refactoring more renaming
2017-06-19 17:30:54 -04:00
Torkel Ödegaard
e0b9ba7554
refactoring renaming dashboard folder operations
2017-06-19 17:15:25 -04:00
Torkel Ödegaard
04da97bffb
dashboard_folders refactoring
2017-06-19 15:37:22 -04:00
Torkel Ödegaard
d6341162cb
refactoring dashboad folder acl checks
2017-06-19 11:54:37 -04:00
Torkel Ödegaard
b494fd7689
dashboard folders acl work
2017-06-19 11:03:54 -04:00
Torkel Ödegaard
cbbbccf12a
refactoring dashoard folder guardian
2017-06-17 18:24:38 -04:00
Torkel Ödegaard
3fe031d25d
refactoring: Dashboard guardian
2017-06-16 21:25:24 -04:00
Daniel Lee
d89c1260c6
WIP: refactor dash search and remove extra query
2017-06-17 03:00:13 +02:00
Daniel Lee
5cf40cbd12
WIP: move guardian logic for search into the sql query
2017-06-17 02:34:05 +02:00
Daniel Lee
84ff62d773
WIP: remove dashboard children on delete
2017-06-17 02:34:05 +02:00
Daniel Lee
9e7aa65fb7
WIP: clean up after user and org user delete
2017-06-15 20:19:54 +02:00
Daniel Lee
699f9095e2
WIP: remove permissions when deleting global user
2017-06-14 23:45:30 +02:00
Daniel Lee
222a938cdf
WIP: delete dependent permissions on user group delete
2017-06-14 18:40:08 +02:00
Daniel Lee
ef0facc987
WIP: fix test after merge conflict
2017-06-12 15:49:09 +02:00
Daniel Lee
9eccb4e79f
WIP: API - add dash permission
2017-06-12 15:49:09 +02:00
Daniel Lee
2097ed0bb8
WIP: Permission Type as string in permission query
2017-06-12 15:49:09 +02:00
Daniel Lee
c602afb9c6
WIP: dashboard search by folder + toggle for list or tree mode
2017-06-12 15:49:09 +02:00
Daniel Lee
6c736e002a
WIP: add dummy root folder to folder picker
...
Can move a dash from a folder back to root level as well
2017-06-12 15:49:09 +02:00
Daniel Lee
68b9342de3
WIP: dashboard search by type (folder or dash)
2017-06-12 15:49:09 +02:00
Daniel Lee
b4576edc90
WIP: fix after upstream sqlstore refactoring
2017-06-12 15:49:09 +02:00
Daniel Lee
fff7b706d6
WIP: user group additions
2017-06-12 15:49:09 +02:00
Daniel Lee
53d11d50fc
WIP: remove browse mode for dashboard search
...
Dashboard folders included in all searches. If a dashboard matches
a search and has a parent folder then the parent folder is appended
to the search result. A hierarchy is then returned in the result
with child dashboards under their parent folders.
2017-06-12 15:49:09 +02:00
Daniel Lee
f1e1da39e3
WIP: get Dashboard Permissions
...
The guardian class checks if the user is allowed to get the
permissions for a dashboard.
2017-06-12 15:49:09 +02:00
Daniel Lee
13314f23ba
WIP: Can remove dashboard permission - sql
2017-06-12 15:49:09 +02:00
Daniel Lee
890ebcbb7b
WIP: limit GetAllowedDashboards sql query with a where in
2017-06-12 15:49:09 +02:00
Daniel Lee
97c13b77bf
WIP: Add or update Dashboard ACL
...
SQL Integration Tests for the guardian class too.
2017-06-12 15:49:09 +02:00
Daniel Lee
3785894b40
WIP: guardian service for search
...
Removes restricted dashboards from search result.
2017-06-12 15:49:09 +02:00
Daniel Lee
552935031b
WIP: API methods for add/remove members to user group
2017-06-12 15:49:09 +02:00
Daniel Lee
0a1df0905e
WIP: add update user group command
2017-06-12 15:49:09 +02:00
Daniel Lee
233cd7af4a
WIP: add user group search
2017-06-12 15:49:09 +02:00
Daniel Lee
af67aea2a9
WIP: add usergroup commands and queries
2017-06-12 15:49:09 +02:00
