You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by pr...@apache.org on 2017/03/02 05:34:46 UTC
zeppelin git commit: ZEPPELIN-2173 Duplicate user names populated in
the Note permission box
Repository: zeppelin
Updated Branches:
refs/heads/master 467e39f37 -> df320481b
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 <re...@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
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/df320481
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/df320481
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/df320481
Branch: refs/heads/master
Commit: df320481be2eaa9937a1293f2e48d3fa173e11d8
Parents: 467e39f
Author: Renjith Kamath <re...@gmail.com>
Authored: Mon Feb 27 19:23:11 2017 +0530
Committer: Prabhjyot Singh <pr...@gmail.com>
Committed: Thu Mar 2 11:04:40 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/df320481/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 2600fb0..928bcbf 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -709,6 +709,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/df320481/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>