Changeset 680

Timestamp:

09/09/06 15:28:59 (2 years ago)

Author:

bchoate

Message:

Fix for display of building range when rebuilding categories.

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (10 diffs)
• branches/wheeljack/tmpl/cms/rebuild_confirm.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/rebuilding.tmpl (modified) (1 diff)

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

@@ -7593 +7593 @@
-    my $order = join ',', @at, 'index';
-    require MT::Entry;
-
+
+
+
-    my %param = ( archive_type_loop => \@data,
-                  build_order => $order,
-                  build_next => 0,
-
+
+
-    $param{index_selected} = ($app->param('prompt')||"") eq 'index';
-    if (my $tmpl_id = $app->param('tmpl_id')) {
@@ -7630 +7633 @@
-    my $type_name = $order[$next];
-    my $total_entries = $q->param('total_entries');
+    my $total_cats = $q->param('total_cats');
-    my %param = ( build_type => $type,
-                  build_next => $next,
-                  total_entries => $total_entries,
+                  total_cats => $total_cats,
-                  build_type_name => $app->translate($type_name) );
-    my $static_count;
@@ -7643 +7648 @@
-            $param{dynamic} = 1;
-        } else {
+            my $total = $type_name eq 'Category' ? $total_cats : $total_entries;
-            $param{limit} = int($entries_per_rebuild * $mult / $static_count);
-            $param{is_individual} = 1;
-            $param{limit} = $entries_per_rebuild * $mult;
-            $param{indiv_range} = "1 - " .
-_entries ? $total_entries
+ ? $total
-        }
-    } elsif ($type_name =~ /^index-(\d+)$/) {
@@ -7702 +7708 @@
-
-    my $total_entries = $q->param('total_entries');
+    my $total_cats = $q->param('total_cats');
+    my $total = $type eq 'Category' ? $total_cats : $total_entries;
-
-    ## Tells MT::_rebuild_entry_archive_type to cache loaded templates so
@@ -7755 +7763 @@
-            unless $perms->can_rebuild;
-        $offset = $q->param('offset') || 0;
-        my $total_cats = MT::Category->count({blog_id => $blog_id});
-        if ($offset < $total_cats) {
-            $app->rebuild( BlogID => $blog_id,
@@ -7765 +7772 @@
-            $offset += $limit;
-        }
-_cats
+
-            $done-- if $done;
-            $next--;
@@ -7775 +7782 @@
-            unless $perms->can_rebuild;
-        $offset = $q->param('offset') || 0;
-_entries
+
-            $app->rebuild( BlogID => $blog_id,
-                           ArchiveType => $type,
@@ -7784 +7791 @@
-            $offset += $limit;
-        }
-_entries
+
-            $done-- if $done;
-            $next--;
@@ -7837 +7844 @@
-                      build_type_name => $app->translate($type_name),
-                      total_entries => $total_entries,
+                      total_cats => $total_cats,
-                      offset => $offset, limit => $limit,
-                      is_bm => scalar $q->param('is_bm'),
@@ -7847 +7855 @@
-                $param{is_individual} = 1;
-                $param{indiv_range} = sprintf "%d - %d", $offset+1,
-_entries ? $total_entries
+ ? $total
-                    $offset + $limit;
-            }

branches/wheeljack/tmpl/cms/rebuild_confirm.tmpl

@@ -6 +6 @@
-<input type="hidden" name="next" value="<TMPL_VAR NAME=BUILD_NEXT>" />
-<input type="hidden" name="total_entries" value="<TMPL_VAR NAME=TOTAL_ENTRIES>" />
+<input type="hidden" name="total_cats" value="<TMPL_VAR NAME=TOTAL_CATS>" />
-
-<h2><span class="weblog-title-highlight"><TMPL_VAR NAME=BLOG_NAME ESCAPE=HTML>:</span> <MT_TRANS phrase="Rebuild"></h2>

branches/wheeljack/tmpl/cms/rebuilding.tmpl

@@ -11 +11 @@
-    window.location='<TMPL_VAR NAME=REDIRECT_TARGET>';
-<TMPL_ELSE>
-
+cats=<TMPL_VAR NAME=TOTAL_CATS>&total_
-</TMPL_IF>
-}