zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mina...@apache.org
Subject zeppelin git commit: [ZEPPELIN-1122] BugFix for repositories snapshot is always set to true.
Date Mon, 18 Jul 2016 18:14:58 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.6 8851f9982 -> 072e48596


[ZEPPELIN-1122] BugFix for repositories snapshot is always set to true.

This PR fixes a bug about snapshot setting and select box(true,false) html.

Bug Fix | Improvement

https://issues.apache.org/jira/browse/ZEPPELIN-1122

1. go Interpreter menu.
2. click ```repository information``` button that is right top.
3. click plus button (to Add New Repository)
and refer to screenshot.

- before
![b](https://cloud.githubusercontent.com/assets/3348133/16590775/e5476c82-4313-11e6-8abf-a1bb662b6ae4.gif)

- after
![a](https://cloud.githubusercontent.com/assets/3348133/16590780/ea491ce4-4313-11e6-82f0-29d7cd9cb0a0.gif)

* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: astroshim <hsshim@nflabs.com>

Closes #1137 from astroshim/ZEPPELIN-1122 and squashes the following commits:

0ce28a0 [astroshim] rebase
be684c8 [astroshim] remove snapshot from popup
829e9c1 [astroshim] fix select box and snapshot backend code.

(cherry picked from commit 60186d8bb9c3b4ccfc63f1326400618fd59a5d02)
Signed-off-by: Mina Lee <minalee@apache.org>

Conflicts:
	zeppelin-web/src/app/interpreter/interpreter.html


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/072e4859
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/072e4859
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/072e4859

Branch: refs/heads/branch-0.6
Commit: 072e48596cae6bdaae0ea2606cc3ef38d898232e
Parents: 8851f99
Author: astroshim <hsshim@nflabs.com>
Authored: Sun Jul 10 20:51:29 2016 +0900
Committer: Mina Lee <minalee@apache.org>
Committed: Tue Jul 19 03:14:40 2016 +0900

----------------------------------------------------------------------
 zeppelin-web/src/app/interpreter/interpreter.html           | 9 +++------
 .../src/components/repository-create/repository-dialog.html | 7 ++++---
 2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/072e4859/zeppelin-web/src/app/interpreter/interpreter.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index 7f516c5..643dd6f 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -58,17 +58,14 @@ limitations under the License.
           <a tabindex="0" class="btn btn-info" role="button"
              popover-trigger="focus"
              popover-placement="right"
-             popover-html-unsafe="
-               <label>URL: </label>
+             popover-html-unsafe="<label>URL: </label>
                {{repo.url}}<br>
-               <label>Snapshot: </label>
-               {{repo.snapshotPolicy.enabled}}<br>
                <label>Username: </label>
                {{repo.authentication.username}}">
             <span class="fa fa-database"></span>
             {{repo.id}}&nbsp;
-            <span ng-if="!isDefaultRepository(repo.id)"
-                  class="fa fa-close blackOpc" ng-click="removeRepository(repo.id)"></span>
+            <span ng-if="!isDefaultRepository(repo.id)" class="fa fa-close blackOpc"
+                  ng-click="removeRepository(repo.id)"></span>
           </a>
         </li>
         <li class="liVertical">

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/072e4859/zeppelin-web/src/components/repository-create/repository-dialog.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/repository-create/repository-dialog.html b/zeppelin-web/src/components/repository-create/repository-dialog.html
index 98b1469..296c018 100644
--- a/zeppelin-web/src/components/repository-create/repository-dialog.html
+++ b/zeppelin-web/src/components/repository-create/repository-dialog.html
@@ -43,9 +43,10 @@ limitations under the License.
             <div class="form-group">
               <label class="control-label col-sm-2" for="repoSnapshot">Snapshot</label>
               <div class="col-sm-10">
-                <select class="form-control" id="repoSnapshot" ng-model="newRepoSetting.snapshot">
-                  <option ng-selected="true">false</option>
-                  <option>true</option>
+                <select class="form-control"
+                        id="repoSnapshot"
+                        ng-model="newRepoSetting.snapshot"
+                        ng-options="col for col in [false,true]">
                 </select>
               </div>
             </div>


Mime
View raw message