Repository: incubator-zeppelin Updated Branches: refs/heads/master db69e921b -> e07738b08
Hotfix - does not working notebook filter on navibar. ### What is this PR for? It doesn't working the notebook filter on navibar. ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-873 ### Screenshots (if appropriate) - before ![image](https://cloud.githubusercontent.com/assets/3348133/15497775/405467f0-21d7-11e6-9eb1-789b21f1764c.png) - after ![image](https://cloud.githubusercontent.com/assets/3348133/15497786/4cc02966-21d7-11e6-855c-3138d617e4c1.png) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: astroshim <hss...@nflabs.com> Closes #912 from astroshim/ZEPPELIN-873 and squashes the following commits: b547d9c [astroshim] Revert "remove tmp notebook" 67d6b5c [astroshim] remove tmp notebook 5e0c3f4 [astroshim] support folder structure in navbar filter. 81a0afb [astroshim] fix bug Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/e07738b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/e07738b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/e07738b0 Branch: refs/heads/master Commit: e07738b083049c455c41c8ce10cf3e8cd156308a Parents: db69e92 Author: astroshim <hss...@nflabs.com> Authored: Fri May 27 10:08:12 2016 +0900 Committer: Mina Lee <mina...@nflabs.com> Committed: Thu May 26 20:45:24 2016 -0700 ---------------------------------------------------------------------- zeppelin-web/src/components/navbar/navbar.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/e07738b0/zeppelin-web/src/components/navbar/navbar.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html index ebc7dfb..361149e 100644 --- a/zeppelin-web/src/components/navbar/navbar.html +++ b/zeppelin-web/src/components/navbar/navbar.html @@ -8,7 +8,8 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - --> +--> + <script type="text/ng-template" id="notebook_list_renderer.html"> <a ng-if="note.id" href="#/notebook/{{note.id}}">{{noteName(note)}} </a> <li ng-if="!note.id" @@ -43,10 +44,7 @@ limitations under the License. <li class="divider"></li> <div id="notebook-list" class="scrollbar-container"> <li class="filter-names" ng-include="'components/filterNoteNames/filter-note-names.html'"></li> - <li ng-repeat="note in navbar.notes.list | filter:query | orderBy:navbar.arrayOrderingSrv.notebookListOrdering track by $index" - ng-class="{'active' : navbar.isActive(note.id)}"> - <a href="#/notebook/{{note.id}}">{{noteName(note)}} </a> - <li ng-repeat="note in navbar.notes.root.children track by $index" ng-class="{'active' : navbar.isActive(note.id)}" ng-include="'notebook_list_renderer.html'"> + <li ng-repeat="note in navbar.notes.root.children | filter:query track by $index" ng-class="{'active' : navbar.isActive(note.id)}" ng-include="'notebook_list_renderer.html'"> </li> </div> </ul>