You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/11/21 16:41:17 UTC
zeppelin git commit: [ZEPPELIN-1693] doesn't work folder feature on
navbar.
Repository: zeppelin
Updated Branches:
refs/heads/master 366590150 -> 498241b0c
[ZEPPELIN-1693] doesn't work folder feature on navbar.
### What is this PR for?
Folder function does not work in navbar.
This is a problem due to a change in the structure of the notebook name change function.
https://github.com/apache/zeppelin/pull/1609
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1693
### How should this be tested?
Create notes in folder format.
Please check the navbar.
### Screenshots (if appropriate)
#### before
![navbar_n](https://cloud.githubusercontent.com/assets/10525473/20489617/a34cccca-b04e-11e6-9fb2-f86df18004f2.gif)
#### after
![navbar_c](https://cloud.githubusercontent.com/assets/10525473/20489586/84f2a434-b04e-11e6-9d1c-4c7c3e59575f.gif)
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: CloverHearts <cl...@gmail.com>
Closes #1664 from cloverhearts/ZEPPELIN-1693 and squashes the following commits:
1ac72a4 [CloverHearts] bug fix folder feature on navbar
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/498241b0
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/498241b0
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/498241b0
Branch: refs/heads/master
Commit: 498241b0c4adb166c89b3b2640e80b5c5f914d33
Parents: 3665901
Author: CloverHearts <cl...@gmail.com>
Authored: Tue Nov 22 00:52:02 2016 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Mon Nov 21 08:41:13 2016 -0800
----------------------------------------------------------------------
zeppelin-web/src/components/navbar/navbar-noteList-elem.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/498241b0/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/navbar/navbar-noteList-elem.html b/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
index 6d44b96..ece94a9 100644
--- a/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
+++ b/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
@@ -12,11 +12,11 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<a class="notebook-list-item" ng-if="note.id" href="#/notebook/{{note.id}}">
+<a class="notebook-list-item" ng-if="!note.children" href="#/notebook/{{note.id}}">
<i style="font-size: 10px; margin-right: 5px;" class="icon-doc"></i>
<span>{{noteName(note)}}</span>
</a>
-<li ng-if="!note.id" ng-click="$event.stopPropagation()">
+<li ng-if="note.children" ng-click="$event.stopPropagation()">
<expand-collapse>
<div>
<a class="notebook-list-item" href="javascript:void(0)">