Changeset 2606

Timestamp:

06/19/08 05:52:32 (6 months ago)

Author:

takayama

Message:

Fixed BugId:80147
* The archive type without a mapping was disabled.

Files:

• branches/release-40/lib/MT/Blog.pm (modified) (1 diff)
• branches/release-40/lib/MT/Template/ContextHandlers.pm (modified) (2 diffs)
• branches/release-40/php/lib/block.mtarchivelist.php (modified) (1 diff)
• branches/release-40/php/lib/block.mtifarchivetypeenabled.php (modified) (1 diff)
• branches/release-40/php/lib/mtdb_base.php (modified) (1 diff)
• branches/release-40/t/lib/MT/Test.pm (modified) (1 diff)

branches/release-40/lib/MT/Blog.pm

@@ -486 +486 @@
-    my ($type) = @_;
-    my %at = map { lc $_ => 1 } split(/,/, $blog->archive_type);
-
+
+
+
+
+
+
+
-}
-

branches/release-40/lib/MT/Template/ContextHandlers.pm

@@ -4300 +4300 @@
-    my ($ctx, $args) = @_;
-    my $blog = $ctx->stash('blog');
-lc 
+
-    return $blog->has_archive_type($at);
-}
@@ -11700 +11700 @@
-    my $archiver = MT->publisher->archiver($at);
-    return '' unless $archiver;
+    my $map_class = MT->model('templatemap');
+    my $map = $map_class->load({ archive_type => $at, blog_id => $blog->id });
+    return '' unless $map;
-
-    my $save_stamps;
-
-    if ($ctx->{current_archive_type} && $arg_at && ($ctx->{current_archive_type} eq $arg_at)) {
-        $save_stamps = 1;

branches/release-40/php/lib/block.mtarchivelist.php

@@ -25 +25 @@
-          $repeat = false;
-          return '';
+        }
+        $map = $ctx->mt->db->fetch_templatemap(
+            array('type' => $at, 'blog_id' => $blog['blog_id']));
+        if (empty($map)) {
+            $repeat = false;
+            return '';
-        }
-        $ctx->localize($localvars);

branches/release-40/php/lib/block.mtifarchivetypeenabled.php

@@ -15 +15 @@
-        $blog_at = ',' . $blog['blog_archive_type'] . ',';
-        $enabled = preg_match("/,$at,/", $blog_at);
+        $map = $ctx->mt->db->fetch_templatemap(
+            array('type' => $at, 'blog_id' => $blog['blog_id']));
+        if (empty($map))
+            $enabled = 0;
-        return $ctx->_hdlr_if($args, $content, $ctx, $repeat, $enabled);
-    } else {

branches/release-40/php/lib/mtdb_base.php

@@ -150 +150 @@
-                       $type_filter
-              order by template_name";
+        $result = $this->get_results($sql, ARRAY_A);
+        return $result;
+    }
+
+    function fetch_templatemap($args) {
+        if (isset($args['type'])) {
+            $type_filter = 'and templatemap_archive_type = \'' . $this->escape($args['type']) . '\'';
+        }
+        if (isset($args['blog_id'])) {
+            $blog_filter = 'and templatemap_blog_id = ' . intval($args['blog_id']);
+        }
+        $sql = "select *
+                  from mt_templatemap
+                 where 1 = 1
+                       $blog_filter
+                       $type_filter
+              order by templatemap_archive_type";
-        $result = $this->get_results($sql, ARRAY_A);
-        return $result;

branches/release-40/t/lib/MT/Test.pm

@@ -682 +682 @@
-    diag "Saved blog-name template";
-
+    my $tmpl_map = new MT::TemplateMap;
+    $tmpl_map->blog_id(1);
+    $tmpl_map->template_id($tmpl->id);
+    $tmpl_map->archive_type('Daily');
+    $tmpl_map->is_preferred(1);
+    $tmpl_map->build_type(1);
+    $tmpl_map->save or die "Couldn't save template map record (Daily): ".$tmpl_map->errstr;
+
+    my $tmpl_map = new MT::TemplateMap;
+    $tmpl_map->blog_id(1);
+    $tmpl_map->template_id($tmpl->id);
+    $tmpl_map->archive_type('Weekly');
+    $tmpl_map->is_preferred(1);
+    $tmpl_map->build_type(1);
+    $tmpl_map->save or die "Couldn't save template map record (Weekly): ".$tmpl_map->errstr;
+
+    # Revert into default for test...
+    $blog->archive_type('Individual,Monthly,Weekly,Daily,Category,Page');
+    $blog->save;
+
-    ### Asset
-    use MT::Asset;