From 114bc05b8dca36c23f9422ff910089b0932cb3cc Mon Sep 17 00:00:00 2001
From: chouseknecht <chouseknecht@me.com>
Date: Fri, 28 Jun 2013 11:40:31 -0400
Subject: [PATCH] Removed Status filter from Job Events page. Changed form
 attribute 'notSearchable' to 'searchable' -cause it just makes more sense.

---
 awx/ui/static/js/helpers/search.js             | 6 +++---
 awx/ui/static/js/lists/JobEvents.js            | 7 ++++---
 awx/ui/static/js/lists/JobHosts.js             | 8 ++++----
 awx/ui/static/lib/ansible/generator-helpers.js | 2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/awx/ui/static/js/helpers/search.js b/awx/ui/static/js/helpers/search.js
index 75cff9306f..1f18858eac 100644
--- a/awx/ui/static/js/helpers/search.js
+++ b/awx/ui/static/js/helpers/search.js
@@ -37,7 +37,7 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
                else {
                   sort_order = (list.fields[fld].desc) ? '-' + fld : fld; 
                }
-               if (list.fields[fld].notSearchable == undefined || list.fields[fld].notSearchable == false) {
+               if (list.fields[fld].searchable == undefined || list.fields[fld].searchable == true) {
                   scope[iterator + 'SearchField'] = fld;
                   scope[iterator + 'SearchFieldLabel'] = list.fields[fld].label;
                }
@@ -46,9 +46,9 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
         }
 
         if (!scope[iterator + 'SearchField']) {
-           // A field marked as key may also be notSearchable
+           // A field marked as key may not be 'searchable'
            for (fld in list.fields) {
-               if (list.fields[fld].notSearchable == undefined || list.fields[fld].notSearchable == false) { 
+               if (list.fields[fld].searchable == undefined || list.fields[fld].searchable == true) { 
                   scope[iterator + 'SearchField'] = fld;
                   scope[iterator + 'SearchFieldLabel'] = list.fields[fld].label;
                   break;
diff --git a/awx/ui/static/js/lists/JobEvents.js b/awx/ui/static/js/lists/JobEvents.js
index e6aa29bf6a..e7b53749e7 100644
--- a/awx/ui/static/js/lists/JobEvents.js
+++ b/awx/ui/static/js/lists/JobEvents.js
@@ -22,7 +22,7 @@ angular.module('JobEventsListDefinition', [])
                 label: 'Date',
                 key: true,
                 nosort: true,
-                notSearchable: true,
+                searchable: false,
                 ngClick: "viewJobEvent(\{\{ jobevent.id \}\})",
                 },
             event_display: {
@@ -30,7 +30,7 @@ angular.module('JobEventsListDefinition', [])
                 hasChildren: true,
                 ngClick: "viewJobEvent(\{\{ jobevent.id \}\})",
                 nosort: true,
-                notSearchable: true
+                searchable: false
                 },
             host: {
                 label: 'Host',
@@ -47,7 +47,8 @@ angular.module('JobEventsListDefinition', [])
                 searchField: 'failed',
                 searchType: 'boolean',
                 searchOptions: [{ name: "success", value: 0 }, { name: "error", value: 1 }],
-                nosort: true
+                nosort: true,
+                searchable: false,
                 }
             },
         
diff --git a/awx/ui/static/js/lists/JobHosts.js b/awx/ui/static/js/lists/JobHosts.js
index c8125e1063..4ce7ff5a01 100644
--- a/awx/ui/static/js/lists/JobHosts.js
+++ b/awx/ui/static/js/lists/JobHosts.js
@@ -27,11 +27,11 @@ angular.module('JobHostDefinition', [])
                 },
              ok: {
                 label: 'Success',
-                notSearchable: true
+                searchable: false
                 },
             changed: {
                 label: 'Changed',
-                notSearchable: true
+                searchable: false
                 },
             failures: {
                 label: 'Failure',
@@ -39,11 +39,11 @@ angular.module('JobHostDefinition', [])
                 },
             dark: {
                 label: 'Unreachable',
-                notSearchable: true
+                searchable: false
                 },
             skipped: {
                 label: 'Skipped',
-                notSearchable: true
+                searchable: false
                 }
             },
         
diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js
index 89836911cd..56b5943903 100644
--- a/awx/ui/static/lib/ansible/generator-helpers.js
+++ b/awx/ui/static/lib/ansible/generator-helpers.js
@@ -177,7 +177,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
         html += "<ul class=\"dropdown-menu\" id=\"" + iterator + "SearchDropdown\">\n";
         
         for ( var fld in form.fields) {
-          if (form.fields[fld].notSearchable == undefined || form.fields[fld].notSearchable == false) {
+          if (form.fields[fld].searchable == undefined || form.fields[fld].searchable == true) {
              html += "<li><a href=\"\" ng-click=\"setSearchField('" + iterator + "','";
              html += fld + "','" + form.fields[fld].label + "')\">" 
                  + form.fields[fld].label + "</a></li>\n";