zeppelin git commit: ZEPPELIN-3207. fix search content not appearing

[mo...@apache.org]

Repository: zeppelin
Updated Branches:
  refs/heads/master 7d2710e8b -> dfcd738df


ZEPPELIN-3207. fix search content not appearing

### What is this PR for?
For some reason search content is not appearing.
This PR fixes this issue.

### What type of PR is it?
Bug Fix

### Todos
-

### What is the Jira issue?
ZEPPELIN-3207

### How should this be tested?
try searching with some sentence like 'bank' (it should be included in tutorial notebook)
see search contents is appearing or not

### Screenshots (if appropriate)
![screen shot 2018-02-07 at 6 04 52 pm](https://user-images.githubusercontent.com/5210115/35907582-aa4ceace-0c31-11e8-94e1-8e102f605a07.png)
![screen shot 2018-02-07 at 6 06 31 pm](https://user-images.githubusercontent.com/5210115/35907584-aa732e28-0c31-11e8-871a-0b764d4e6f59.png)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Kevin (Sangwoo) Kim <sa...@gmail.com>
Author: Kevin Kim <sa...@gmail.com>

Closes #2770 from swkimme/fix-search-bug and squashes the following commits:

606cdf8a0 [Kevin (Sangwoo) Kim] Update result-list.controller.js
d98b9698d [Kevin (Sangwoo) Kim] Update result-list.controller.js
d9c086d32 [Kevin (Sangwoo) Kim] Update result-list.controller.js
ac77697d3 [Kevin Kim] fix search content not appearing


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

Branch: refs/heads/master
Commit: dfcd738dfb99f335cc8a628f291c126a244a6eb1
Parents: 7d2710e
Author: Kevin (Sangwoo) Kim <sa...@gmail.com>
Authored: Mon Feb 19 17:54:03 2018 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Mon Feb 19 18:16:54 2018 -0800

----------------------------------------------------------------------
 zeppelin-web/src/app/search/result-list.controller.js | 1 +
 zeppelin-web/src/app/search/result-list.html          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dfcd738d/zeppelin-web/src/app/search/result-list.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/search/result-list.controller.js b/zeppelin-web/src/app/search/result-list.controller.js
index cd7542d..05be721 100644
--- a/zeppelin-web/src/app/search/result-list.controller.js
+++ b/zeppelin-web/src/app/search/result-list.controller.js
@@ -148,6 +148,7 @@ function SearchResultCtrl ($scope, $routeParams, searchService) {
       )
 
       _editor.getSession().setValue(lines.join('\n'))
+      note.searchResult = lines
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dfcd738d/zeppelin-web/src/app/search/result-list.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/search/result-list.html b/zeppelin-web/src/app/search/result-list.html
index 67b0d7c..804fc16 100644
--- a/zeppelin-web/src/app/search/result-list.html
+++ b/zeppelin-web/src/app/search/result-list.html
@@ -32,7 +32,7 @@ limitations under the License.
               onLoad: highlightSearchResults(note),
               require: ['ace/ext/language_tools']
             }"
-            ng-model="_"
+            ng-model="note.searchResult"
           >
           </div>
           </div>