default all false

no longer default to all: true for searches, only specify it for user searches

3 files changed, 15 insertions, 7 deletions

diff --git a/install/ui/entity.js b/install/ui/entity.js
index c23ce500a..31be28600 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -610,7 +610,10 @@ IPA.entity_builder = function(){
     };
 
     that.search_facet = function (spec){
-        current_facet = IPA.search_facet({entity_name:that.entity_name});
+        current_facet = IPA.search_facet({
+            entity_name:that.entity_name,
+            search_all: spec.search_all || false
+        });
         //once everything usese this mechanism, inline the init code
         current_facet.init();
 
diff --git a/install/ui/search.js b/install/ui/search.js
index 9d22dfcc4..dc347aa39 100644
--- a/install/ui/search.js
+++ b/install/ui/search.js
@@ -32,6 +32,7 @@ IPA.search_widget = function (spec) {
 
     that.entity_name = spec.entity_name;
     that.facet = spec.facet;
+    that.search_all = spec.search_all || false;
 
     that.create = function(container) {
 
@@ -269,7 +270,7 @@ IPA.search_widget = function (spec) {
 
         var filter = $.bbq.getState(that.entity_name + '-filter', true) || '';
         IPA.cmd(
-          'find', [filter], {all: true}, on_success, on_error,
+          'find', [filter], {all: that.search_all}, on_success, on_error,
             that.entity_name);
     };
 
@@ -290,6 +291,7 @@ IPA.search_facet = function(spec) {
     that.entity_name = spec.entity_name;
     that.columns = [];
     that.columns_by_name = {};
+    that.search_all = spec.search_all || false;
 
     that.__defineGetter__('entity_name', function() {
         return that._entity_name;
@@ -356,10 +358,12 @@ IPA.search_facet = function(spec) {
         that.facet_init();
 
         that.table = IPA.search_widget({
-            'id': that.entity_name+'-search',
-            'name': 'search', 'label': IPA.metadata.objects[that.entity_name].label,
-            'entity_name': that.entity_name,
-            'facet': that
+            id: that.entity_name+'-search',
+            name: 'search', 
+            label: IPA.metadata.objects[that.entity_name].label,
+            entity_name: that.entity_name,
+            facet: that,
+            search_all: that.search_all
         });
 
         for (var i=0; i<that.columns.length; i++) {
diff --git a/install/ui/user.js b/install/ui/user.js
index 0ea3acf29..a922f9f89 100644
--- a/install/ui/user.js
+++ b/install/ui/user.js
@@ -30,7 +30,8 @@ IPA.entity_factories.user = function() {
         entity('user').
         search_facet({
             columns:['uid','cn','uidnumber','mail','telephonenumber','title'],
-            add_fields: ['uid','givenname','sn']
+            add_fields: ['uid','givenname','sn'],
+            search_all: true
         }).
         details_facet([
             {