Changeset 2504

Timestamp:

06/04/08 03:57:17 (21 months ago)

Author:

fumiakiy

Message:

Show Save&Rebuild button when template has a static map even if the profile is set to dynamic. BugId:80014

Location:

branches/release-39

Files:

• lib/MT/CMS/Template.pm (modified) (2 diffs)
• lib/MT/WeblogPublisher.pm (modified) (2 diffs)
• tmpl/cms/edit_template.tmpl (modified) (2 diffs)

branches/release-39/lib/MT/CMS/Template.pm

@@ -113 +113 @@
         $param->{published_url} = $published_url if $published_url;
         $param->{saved_rebuild} = 1 if $q->param('saved_rebuild');
+        $param->{static_maps} = $obj->build_type == MT::PublishOption::DYNAMIC() ? 0 : 1;
 
         my $filter = $app->param('filter_key');
@@ -297 +298 @@
                 $param->{object_loop} = $param->{template_map_loop} = $maps
                   if @$maps;
-                my %archive_types = map { $_->{archive_label} => 1 } @$maps;
-                $param->{enabled_archive_types} = join(", ", sort keys %archive_types);
+                my %at;
+                my $build_type = MT::PublishOption::DYNAMIC();
+                my $build_type_0 = 0;
+                foreach my $map ( @$maps ) {
+                    $at{ $map->{archive_label} } = 1;
+                    $build_type_0 = $map->{map_build_type};
+                    $build_type = $map->{map_build_type}
+                        if MT::PublishOption::DYNAMIC() ne $map->{map_build_type};
+                }
+                $param->{enabled_archive_types} = join(", ", sort keys %at);
+                $param->{static_maps} = $build_type == MT::PublishOption::DYNAMIC() ? 0 : 1;
+                $param->{build_type_0} = 1 unless $build_type_0;
             }
         }

branches/release-39/lib/MT/WeblogPublisher.pm

@@ -988 +988 @@
     # 404 will be triggered.
     require MT::PublishOption;
-    if ( $tmpl->build_dynamic
-      || ( $map->build_type == MT::PublishOption::DYNAMIC() ) )
+    if ( $map->build_type == MT::PublishOption::DYNAMIC() ) 
     {
         rename(
@@ -1003 +1002 @@
     }
 
-    return 1 if ( $tmpl->build_dynamic )
-        || ( $map->build_type == MT::PublishOption::DYNAMIC() );
+    return 1 if ( $map->build_type == MT::PublishOption::DYNAMIC() );
     return 1 if ( $entry && $entry->status != MT::Entry::RELEASE() );
-    return 1 unless ( $tmpl->build_type );
+    return 1 unless ( $map->build_type );
 
     my $timer = MT->get_timer;

branches/release-39/tmpl/cms/edit_template.tmpl

@@ -161 +161 @@
     </mt:if>
     <mt:unless name="build_type_0">
-    <mt:unless name="build_dynamic">
+    <mt:if name="static_maps">
         <mt:if name="can_rebuild">
             <mt:if name="template_group" like="/^(archive|index)$/">
@@ -173 +173 @@
             </mt:if>
         </mt:if>
-    </mt:unless>
+    </mt:if>
     </mt:unless>
     <div id="autosave-notification-<$mt:var name="bar_position" default="top"$>" class="autosave-notification"></div>