GUACAMOLE-220: Convert "namespace" attribute of managementButtons directive to string binding.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/ae0512c2 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/ae0512c2 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/ae0512c2 Branch: refs/heads/master Commit: ae0512c2667b261405016a7d164239de8e96610c Parents: 2c41e38 Author: Michael Jumper <mjum...@apache.org> Authored: Thu May 3 23:37:19 2018 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Thu May 3 23:37:19 2018 -0700 ---------------------------------------------------------------------- .../src/main/webapp/app/manage/directives/managementButtons.js | 2 +- .../src/main/webapp/app/manage/templates/manageConnection.html | 2 +- .../main/webapp/app/manage/templates/manageConnectionGroup.html | 2 +- .../src/main/webapp/app/manage/templates/manageSharingProfile.html | 2 +- guacamole/src/main/webapp/app/manage/templates/manageUser.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ae0512c2/guacamole/src/main/webapp/app/manage/directives/managementButtons.js ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/manage/directives/managementButtons.js b/guacamole/src/main/webapp/app/manage/directives/managementButtons.js index 4074548..a83b82c 100644 --- a/guacamole/src/main/webapp/app/manage/directives/managementButtons.js +++ b/guacamole/src/main/webapp/app/manage/directives/managementButtons.js @@ -50,7 +50,7 @@ angular.module('manage').directive('managementButtons', ['$injector', * * @type String */ - namespace : '=', + namespace : '@', /** * The permissions which dictate the management actions available http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ae0512c2/guacamole/src/main/webapp/app/manage/templates/manageConnection.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html index e780513..17a1108 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html @@ -53,7 +53,7 @@ </div> <!-- Form action buttons --> - <management-buttons namespace="'MANAGE_CONNECTION'" + <management-buttons namespace="MANAGE_CONNECTION" permissions="managementPermissions" save="saveConnection()" delete="deleteConnection()" http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ae0512c2/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html index 926dc11..0f12180 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html @@ -45,7 +45,7 @@ </div> <!-- Form action buttons --> - <management-buttons namespace="'MANAGE_CONNECTION_GROUP'" + <management-buttons namespace="MANAGE_CONNECTION_GROUP" permissions="managementPermissions" save="saveConnectionGroup()" delete="deleteConnectionGroup()" http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ae0512c2/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html b/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html index ac52fa3..d242e59 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html @@ -34,7 +34,7 @@ </div> <!-- Form action buttons --> - <management-buttons namespace="'MANAGE_SHARING_PROFILE'" + <management-buttons namespace="MANAGE_SHARING_PROFILE" permissions="managementPermissions" save="saveSharingProfile()" delete="deleteSharingProfile()" http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ae0512c2/guacamole/src/main/webapp/app/manage/templates/manageUser.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/manage/templates/manageUser.html b/guacamole/src/main/webapp/app/manage/templates/manageUser.html index 6770d31..660554b 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageUser.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageUser.html @@ -65,7 +65,7 @@ </connection-permission-editor> <!-- Form action buttons --> - <management-buttons namespace="'MANAGE_USER'" + <management-buttons namespace="MANAGE_USER" permissions="managementPermissions[dataSource]" save="saveUser()" delete="deleteUser()"