Changeset 1757

Timestamp:

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

Author:

mpaschal

Message:

Search all kinds of entries when searching entries
BugzID: 75420

Location:

branches/release-33/lib/MT

Files:

• App/Search.pm (modified) (2 diffs)
• Object.pm (modified) (1 diff)

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};

branches/release-33/lib/MT/Object.pm

@@ -277 +277 @@
     }
     elsif (ref $terms eq 'ARRAY') {
+        if (my @class_terms = grep { ref $_ eq 'HASH' && 1 == scalar keys %$_ && $_->{$col} } @$terms) {
+            # Filter out any unlimiting class terms (class = *).
+            @$terms = grep { ref $_ ne 'HASH' || 1 != scalar keys %$_ || !$_->{$col} || $_->{$col} ne '*' } @$terms;
+
+            # The class column has been explicitly given or removed, so don't
+            # add one.
+            return;
+        }
         @$terms = ( { $col => $props->{class_type} } => 'AND' => [ @$terms ] );
-
     }
 }