#298: Fixed wiki plugin search filter.

hawtio · Apr 27, 2013 · 27db965 · 27db965
1 parent b87aaf6
commit 27db965
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/hawtio-web/src/main/webapp/app/wiki/html/formTable.html b/hawtio-web/src/main/webapp/app/wiki/html/formTable.html
@@ -27,7 +27,7 @@
   </div>
 
   <div class="wiki-fixed row-fluid">
-    <input class="search-query span12" type="text" ng-model="searchText"
+    <input class="search-query span12" type="text" ng-model="gridOptions.filterOptions.filterText"
            placeholder="Filter...">
   </div>
 

diff --git a/hawtio-web/src/main/webapp/app/wiki/html/history.html b/hawtio-web/src/main/webapp/app/wiki/html/history.html
@@ -34,7 +34,7 @@
     </div>
     <div class="span8">
       <div class="control-group">
-        <input class="span12 search-query" type="text" ng-model="searchText" placeholder="search">
+        <input class="span12 search-query" type="text" ng-model="gridOptions.filterOptions.filterText" placeholder="search">
       </div>
     </div>
   </div>

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/formTable.ts b/hawtio-web/src/main/webapp/app/wiki/js/formTable.ts
@@ -3,7 +3,6 @@ module Wiki {
   export function FormTableController($scope, $location, $routeParams, workspace:Workspace, wikiRepository:GitWikiRepository) {
     $scope.pageId = Wiki.pageId($routeParams, $location);
     $scope.columnDefs = [];
-    $scope.searchText = null;
 
     $scope.viewLink = (row) => {
       return childLink(row, "#/wiki/view");
@@ -55,7 +54,7 @@ module Wiki {
     }
 
     function updateView() {
-      $scope.git = wikiRepository.jsonChildContents($scope.pageId, "*.json", $scope.searchText, onResults);
+      $scope.git = wikiRepository.jsonChildContents($scope.pageId, "*.json", $scope.gridOptions.filterOptions.filterText, onResults);
     }
 
     function onFormData(details) {
@@ -85,7 +84,7 @@ module Wiki {
           displayFooter: false,
           showFilter: false,
           filterOptions: {
-            filterText: "searchText"
+            filterText: ''
           },
           columnDefs: columnDefs
         };

diff --git a/hawtio-web/src/main/webapp/app/wiki/js/history.ts b/hawtio-web/src/main/webapp/app/wiki/js/history.ts
@@ -4,7 +4,6 @@ module Wiki {
 
     $scope.pageId = Wiki.pageId($routeParams, $location);
     $scope.selectedItems = [];
-    $scope.searchText = "";
 
     // TODO we could configure this?
     $scope.dateFormat = 'EEE, MMM d, y : hh:mm:ss a';
@@ -14,7 +13,7 @@ module Wiki {
       showFilter: false,
       selectedItems: $scope.selectedItems,
       filterOptions: {
-        filterText: "searchText"
+        filterText: ''
       },
       columnDefs: [
         {