Changeset 1308 for branches/release-29/lib/MT/App/CMS.pm

Timestamp:

01/22/08 00:15:49 (23 months ago)

Author:

bsmith

Message:

Merging commits from release-28 changesets 1274 to 1306

Files:

• branches/release-29/lib/MT/App/CMS.pm (modified) (8 diffs)

branches/release-29/lib/MT/App/CMS.pm

@@ -755 +755 @@
                 permission  => 'manage_pages',
                 condition   => sub {
-                    return 0 if $app->mode eq 'view';
+                    return $app->mode ne 'view';
                 },
             },
@@ -766 +766 @@
                 permission  => 'manage_pages',
                 condition   => sub {
-                    return 0 if $app->mode eq 'view';
+                    return $app->mode ne 'view';
                 },
             },
@@ -1562 +1562 @@
                     my @blogs = 
                         map { $_->blog_id }
-                          grep { $_->can_create_post || $_->can_pubish_post || $_->can_edit_all_posts }
+                          grep { $_->can_create_post || $_->can_publish_post || $_->can_edit_all_posts }
                           MT::Permission->load( { author_id => $app->user->id } );
                     return 1 if @blogs;
@@ -2912 +2912 @@
         $arg{offset} = $offset = $total - $limit;
     }
-    elsif ( ( $offset < 0 ) || ( $total - $offset < $limit ) ) {
-        $arg{offset} = $offset = 0;
+    elsif ( $offset && ( ( $offset < 0 ) || ( $total - $offset < $limit ) ) ) {
+        $arg{offset} = $offset = $total - $limit;
     }
     else {
@@ -2973 +2973 @@
     $param{object_label_plural}     = $tag_class->class_label_plural;
     $param{object_type}             = 'tag';
+
+    my $search_types = $app->search_apis($app->blog ? 'blog' : 'system');
+    if (grep { $_->{key} eq $param{tag_object_type} } @$search_types) {
+        $param{search_type} = $param{tag_object_type};
+        $param{search_label} = $param{tag_object_label_plural};
+    } else {
+        $param{search_type} = 'entry';
+        $param{search_label} = $app->translate("Entries");
+    }
+
     $param{list_start}              = $offset + 1;
     $param{list_end}                = $offset + scalar @$data;
@@ -4413 +4423 @@
     $param{can_create_blog} = $author->can_create_blog;
     $param{saved_deleted}   = $app->param('saved_deleted');
+    $param{refreshed}       = $app->param('refreshed');
     $param{nav_blogs}       = 1;
     $param{list_noncron}    = 1;
@@ -11895 +11906 @@
         $arg{offset} = $offset = $total - $limit;
     }
-    elsif ( ( $offset < 0 ) || ( $total - $offset < $limit ) ) {
-        $arg{offset} = $offset = 0;
+    elsif ( $offset && ( ( $offset < 0 ) || ( $total - $offset < $limit ) ) ) {
+        $arg{offset} = $offset = $total - $offset;
     }
     elsif ($offset) {
@@ -12332 +12343 @@
         $arg{offset} = $offset = $total - $limit;
     }
-    elsif ( ( $offset < 0 ) || ( $total - $offset < $limit ) ) {
-        $arg{offset} = $offset = 0;
+    elsif ( $offset && ( ( $offset < 0 ) || ( $total - $offset < $limit ) ) ) {
+        $arg{offset} = $offset = $total - $offset;
     }
     else {