Changeset 1757 for branches/release-33/lib/MT/App/Search.pm

Timestamp:

04/03/08 18:22:41 (20 months ago)

Author:

mpaschal

Message:

Search all kinds of entries when searching entries
BugzID: 75420

Files:

• branches/release-33/lib/MT/App/Search.pm (modified) (2 diffs)

branches/release-33/lib/MT/App/Search.pm

@@ -66 +66 @@
                 },
                 'sort'  => 'authored_on',
-                terms   => { status => 2 }, #MT::Entry::RELEASE()
+                terms   => { status => 2, class => '*' }, #MT::Entry::RELEASE()
                 filter_types => {
                     author   => \&_join_author,
@@ -342 +342 @@
 
     my @terms;
-    push @terms, \%def_terms if %def_terms;
+    if (%def_terms) {
+        # If we have a term for the model's class column, add it separately, so
+        # array search() doesn't add the default class column term.
+        my $type = $app->{searchparam}{Type};
+        my $model_class = MT->model($type);
+        if (my $class_col = $model_class->properties->{class_column}) {
+            if ($def_terms{$class_col}) {
+                push @terms, { $class_col => delete $def_terms{$class_col} };
+            }
+        }
+
+        push @terms, \%def_terms;
+    }
 
     my $columns = $params->{columns};