GUACAMOLE-292: Merge attribute editing permissioning.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/be3bc6cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/be3bc6cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/be3bc6cd Branch: refs/heads/master Commit: be3bc6cded9de432b1812ac659643c8307246386 Parents: 07fb473 74293c2 Author: James Muehlner <james.muehl...@guac-dev.org> Authored: Fri May 26 22:44:36 2017 -0700 Committer: James Muehlner <james.muehl...@guac-dev.org> Committed: Fri May 26 22:44:36 2017 -0700 ---------------------------------------------------------------------- .../base/ModeledDirectoryObjectService.java | 15 +++- .../guacamole/auth/jdbc/user/ModeledUser.java | 74 ++++++++++++++++++-- .../guacamole/auth/jdbc/user/UserService.java | 32 +++++++-- .../src/main/webapp/app/form/directives/form.js | 60 +++++++++++++++- .../main/webapp/app/form/templates/form.html | 4 +- .../controllers/manageConnectionController.js | 17 +++++ .../manageConnectionGroupController.js | 21 +++++- .../manageSharingProfileController.js | 19 +++++ .../manage/controllers/manageUserController.js | 21 +++++- .../app/manage/templates/manageConnection.html | 3 +- .../manage/templates/manageConnectionGroup.html | 3 +- .../manage/templates/manageSharingProfile.html | 2 +- .../webapp/app/manage/templates/manageUser.html | 3 +- 13 files changed, 251 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
