Changeset 967

Timestamp:

12/21/06 00:44:41 (2 years ago)

Author:

bchoate

Message:

Fixed display of author when asset file can't be found. BugId: 45987. Updates to make rebuilding of multiple entries more efficient (when selecting to rebuild, or selecting entries to unpublish/publish). BugId: 39359. Fixed handling of MT::Asset objects when overwriting an existing file. BugId: 45617

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (9 diffs)

branches/wheeljack/lib/MT/App/CMS.pm

@@ -254 +254 @@
-                              label => "Unpublish TrackBack(s)",
-                              code => \&unapprove_item,
-$_[0] ne 'junk'
+@_ && ($_[0] ne 'junk')
-                          }, 1);
-    $app->add_itemset_action({type => 'comment',
@@ -260 +260 @@
-                              label => "Unpublish Comment(s)",
-                              code => \&unapprove_item,
-$_[0] ne 'junk'
+@_ && ($_[0] ne 'junk')
-                          }, 1);
-    $app->add_itemset_action({type => 'comment',
@@ -936 +936 @@
-                $row->{file_size_formatted} = sprintf("%.1f MB", $size / 1024000);
-            }
-            my $ts = $obj->created_on;
-            unless ($ts) {
-                $ts = $stat[10];
-                $ts = epoch2ts($blog, $ts);
-            }
-            if (my $by = $obj->created_by) {
-                my $user = MT::Author->load($by, { cached_ok => 1 });
-                $row->{created_by} = $user ? $user->name : '';
-            }
-            if ($ts) {
-                $row->{created_on_formatted} =
-                    format_ts("%Y.%m.%d", $ts); 
-                $row->{created_on_time_formatted} =
-                    format_ts("%Y-%m-%d %H:%M:%S", $ts); 
-                $row->{created_on_relative} =
-                    relative_date($ts, time, $blog);
-            }
-        } else {
-            $row->{file_is_missing} = 1;
+        }
+        my $ts = $obj->created_on;
+        if (my $by = $obj->created_by) {
+            my $user = MT::Author->load($by, { cached_ok => 1 });
+            $row->{created_by} = $user ? $user->name : '';
+        }
+        if ($ts) {
+            $row->{created_on_formatted} =
+                format_ts("%Y.%m.%d", $ts); 
+            $row->{created_on_time_formatted} =
+                format_ts("%Y-%m-%d %H:%M:%S", $ts); 
+            $row->{created_on_relative} =
+                relative_date($ts, time, $blog);
-        }
-        $row->{metadata_json} = JSON::objToJson($meta);
@@ -5685 +5681 @@
-    $app->{goback} = "window.location='". $app->return_uri . "'";
-    if ($type eq 'entry') {
-
-
-
-
-
-
-
-
-
+
+
-    } elsif ($type eq 'template') {
-        require MT::Template;
@@ -5706 +5695 @@
-
-sub draft_entries {
+    my $app = shift;
-    require MT::Entry;
-_[0]
+app
-}
-
-sub publish_entries {
+    my $app = shift;
-    require MT::Entry;
-_[0]
+app
-}
-
@@ -5718 +5709 @@
-    my $app = shift;
-    my ($new_status, @ids) = @_;
-
-
+
+
+
+
-    my @bad_ids;
-    my @rebuild_list;
+    my %rebuild_these;
-    require MT::Entry;
-    foreach my $id (@ids) {
-        my $entry = MT::Entry->load($id, {cached_ok=>1}) or return $app->errtrans("One of the entries ([_1]) did not actually exist", $id);
-push @rebuild_list, $entry
+next
-        $entry->status($new_status);
-
-
-
-
-
-
-
-
+
+
+
-}
-
-sub approve_item {
-
-
+
+
+
-}
-
-sub unapprove_item {
-
-
+
+
+
-}
-
@@ -9266 +9257 @@
-    my $ext = (File::Basename::fileparse($local_file, qr/[A-Za-z]+$/))[2];
-
-    # Does the file have dimensions with a recognized image extension?
-    require MT::Asset::Image;
-    my $is_image = defined($w) && defined($h) && MT::Asset::Image->can_handle($local_basename)
-        ? 1 : 0;
-
-    require MT::Asset;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    my $original = $asset->clone;
-    $asset->blog_id($blog_id);
-    $asset->url($url);
-    $asset->file_path($local_file);
-    $asset->file_name($local_basename);
-    $asset->file_ext($ext);
-    if ($is_image) {
-        $asset->image_width($w);
-        $asset->image_height($h);
-    }
-    $asset->created_by($app->user->id);
-    $asset->save;
-    MT->run_callbacks('CMSPostSave.asset', $app, $asset, $original);
@@ -10342 +10335 @@
-    # if there's nothing to rebuild, just return
-    if (!keys %$rebuild_set) {
+        # now, rebuild indexes for affected blogs
+        my @blogs = $app->param('blog_ids');
+        foreach my $blog_id (@blogs) {
+            my $blog = MT::Blog->load($blog_id) or next;
+            $app->rebuild_indexes( Blog => $blog );
+        }
-        return $app->call_return;
-    }
-
-$options{how} eq NEW_PHASE
+exists $options{how} && ($options{how} eq NEW_PHASE)
-        my $params = {
-            return_args => $app->return_args,
+            blog_id => $app->param('blog_id') || 0,
-            id => [ keys %$rebuild_set ]
-        };
@@ -10354 +10354 @@
-                                                   args => $params));
-        return $app->build_page('rebuilding.tmpl', \%param);
-
-    } else {
+        my @blogs = $app->param('blog_ids');
+        my %blogs = map { $_ => () } @blogs;
+        my @set = keys %$rebuild_set;
+        my @rest;
+        my $entries_per_rebuild = $app->config('EntriesPerRebuild');
+        if (scalar @set > $entries_per_rebuild) {
+            @rest = $set[$entries_per_rebuild..$#set];
+            @set = $set[0..$entries_per_rebuild-1];
+        }
-        require MT::Entry;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}