Repository: zeppelin Updated Branches: refs/heads/branch-0.7 47f93835f -> c0a1d73da
ZEPPELIN-2173 Duplicate user names populated in the Note permission box ### What is this PR for? Duplicate user names populated in the Note permission box ### What type of PR is it? Bug Fix ### Todos * [ ] - Task ### What is the Jira issue? * [ZEPPELIN-2173](https://issues.apache.org/jira/browse/ZEPPELIN-2173) ### How should this be tested? See JIRA description for the steps to reproduce the issue. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? n/a * Is there breaking changes for older versions? n/a * Does this needs documentation? n/a Author: Renjith Kamath <renjith.kam...@gmail.com> Closes #2076 from r-kamath/ZEPPELIN-2173 and squashes the following commits: 14296b4 [Renjith Kamath] ZEPPELIN-2173 Duplicate user names populated in the Note permission box (cherry picked from commit df320481be2eaa9937a1293f2e48d3fa173e11d8) Signed-off-by: Prabhjyot Singh <prabhjyotsi...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c0a1d73d Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c0a1d73d Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c0a1d73d Branch: refs/heads/branch-0.7 Commit: c0a1d73da89f0f47d391dc3127e464a4ec879338 Parents: 47f9383 Author: Renjith Kamath <renjith.kam...@gmail.com> Authored: Mon Feb 27 19:23:11 2017 +0530 Committer: Prabhjyot Singh <prabhjyotsi...@gmail.com> Committed: Thu Mar 2 11:04:55 2017 +0530 ---------------------------------------------------------------------- zeppelin-web/src/app/notebook/notebook.controller.js | 1 + zeppelin-web/src/app/notebook/notebook.html | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c0a1d73d/zeppelin-web/src/app/notebook/notebook.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js index 274ddd0..6d82024 100644 --- a/zeppelin-web/src/app/notebook/notebook.controller.js +++ b/zeppelin-web/src/app/notebook/notebook.controller.js @@ -723,6 +723,7 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope, $scope.permissions.owners = angular.element('#selectOwners').val(); $scope.permissions.readers = angular.element('#selectReaders').val(); $scope.permissions.writers = angular.element('#selectWriters').val(); + angular.element('.permissionsForm select').find('option:not([is-select2="false"])').remove(); } $scope.restartInterpreter = function(interpeter) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c0a1d73d/zeppelin-web/src/app/notebook/notebook.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html index 35b3dff..303a1f0 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -79,19 +79,19 @@ limitations under the License. data-ng-model="permissions"> <p><span class="owners">Owners </span> <select id="selectOwners" multiple="multiple"> - <option ng-repeat="owner in permissions.owners" selected="selected">{{owner}}</option> + <option is-select2="false" ng-repeat="owner in permissions.owners" selected="selected">{{owner}}</option> </select> Owners can change permissions,read and write the note. </p> <p><span class="writers">Writers </span> <select id="selectWriters" multiple="multiple"> - <option ng-repeat="writers in permissions.writers" selected="selected">{{writers}}</option> + <option is-select2="false" ng-repeat="writers in permissions.writers" selected="selected">{{writers}}</option> </select> Writers can read and write the note. </p> <p><span class="readers">Readers </span> <select id="selectReaders" multiple="multiple"> - <option ng-repeat="readers in permissions.readers" selected="selected">{{readers}}</option> + <option is-select2="false" ng-repeat="readers in permissions.readers" selected="selected">{{readers}}</option> </select> Readers can only read the note. </p>
