Changeset 1786
- Timestamp:
- 04/07/08 09:10:54 (6 months ago)
- Files:
-
- branches/release-33/lib/MT/App/CMS.pm (modified) (4 diffs)
- branches/release-33/lib/MT/CMS/Template.pm (modified) (4 diffs)
- branches/release-33/tmpl/cms/include/template_table.tmpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/release-33/lib/MT/App/CMS.pm
r1778 r1786 190 190 'refresh_all_templates' => "${pkg}Template::refresh_all_templates", 191 191 'preview_template' => "${pkg}Template::preview", 192 'publish_index_templates' => "${pkg}Template::publish_index_templates", 193 'publish_archive_templates'=> "${pkg}Template::publish_archive_templates", 192 194 193 195 ## Comment Replies … … 623 625 refresh_tmpl_templates => { 624 626 label => "Refresh Template(s)", 625 code => "${pkg}Template::refresh_individual_template E",627 code => "${pkg}Template::refresh_individual_templates", 626 628 permission => 'edit_templates', 629 order => 100, 627 630 }, 628 631 publish_index_templates => { 629 632 label => "Publish Template(s)", 630 code => "${pkg} Blog::publish_index_templates",633 code => "${pkg}Template::publish_index_templates", 631 634 permission => 'rebuild', 632 635 condition => sub { … … 640 643 ; 641 644 }, 645 order => 200, 646 }, 647 publish_archive_templates => { 648 label => "Publish Template(s)", 649 code => "${pkg}Template::publish_archive_templates", 650 permission => 'rebuild', 651 condition => sub { 652 my $app = MT->app; 653 my $tmpl_type = $app->param('filter_key'); 654 return $app->mode eq 'itemset_action' ? 1 655 : !$app->blog ? 0 656 : !$tmpl_type ? 0 657 : $tmpl_type eq 'archive_templates' ? 1 658 : 0; 659 }, 660 order => 300, 642 661 }, 643 662 copy_templates => { … … 645 664 code => "${pkg}Template::clone_templates", 646 665 permission => 'edit_templates', 666 order => 400, 647 667 }, 648 668 }, branches/release-33/lib/MT/CMS/Template.pm
r1775 r1786 505 505 require MT::Template; 506 506 my $blog_id = $app->param('blog_id') || 0; 507 # my $filter = $app->param('filter_key');508 # if ( !$filter ) {509 # if ($blog) {510 # $filter = 'templates';511 # $app->param( 'filter_key', 'templates' );512 # }513 # else {514 # $filter = 'module_templates';515 # $app->param( 'filter_key', 'module_templates' );516 # }517 # }518 # else {519 # # global index templates redirect to module templates520 # if ( !$blog && $filter eq 'templates' ) {521 # $filter = 'module_templates';522 # $app->param( 'filter_key', 'module_templates' );523 # }524 # }525 507 my $terms = { blog_id => $blog_id }; 526 508 my $args = { sort => 'name' }; … … 564 546 my $params = {}; 565 547 my $filter = $app->param('filter_key'); 566 $app->delete_param('filter_key') if $filter;567 548 my $template_type = $filter || ''; 568 549 $template_type =~ s/_templates//; … … 654 635 } 655 636 foreach my $tmpl_type (@types) { 637 $app->delete_param('filter_key') if $filter; 638 if ( $tmpl_type eq 'index' ) { 639 $filter = 'index_templates'; 640 $app->param( 'filter_key', 'index_templates' ); 641 } 642 elsif ( $tmpl_type eq 'archive' ) { 643 $filter = 'archive_templates'; 644 $app->param( 'filter_key', 'archive_templates' ); 645 } 656 646 $terms->{type} = $types{$tmpl_type}->{type}; 657 647 my $tmpl_param = $app->listing( … … 1847 1837 } 1848 1838 1839 sub publish_archive_templates { 1840 my $app = shift; 1841 $app->validate_magic or return; 1842 1843 # permission check 1844 my $perms = $app->permissions; 1845 return $app->errtrans("Permission denied.") 1846 unless $app->user->is_superuser 1847 || $perms->can_administer_blog 1848 || $perms->can_rebuild; 1849 1850 my $blog = $app->blog; 1851 my $templates = 1852 MT->model('template')->lookup_multi( [ $app->param('id') ] ); 1853 use MT::TemplateMap; 1854 TEMPLATE: for my $tmpl (@$templates) { 1855 next TEMPLATE if !defined $tmpl; 1856 next TEMPLATE if $tmpl->blog_id != $blog->id; 1857 my @tmpl_maps = MT::TemplateMap->load( { template_id => $tmpl->id } ); 1858 foreach my $map (@tmpl_maps) { 1859 $app->rebuild( 1860 BlogID => $blog->id, 1861 ArchiveType => $map->archive_type, 1862 NoIndexes => 1, 1863 ); 1864 } 1865 } 1866 1867 $app->call_return( published => 1 ); 1868 } 1869 1849 1870 { 1850 1871 my @period_options = ( branches/release-33/tmpl/cms/include/template_table.tmpl
r1730 r1786 23 23 <mt:setvarblock name="action_buttons"> 24 24 <mt:unless name="template_type" eq="system"><mt:unless name="template_type" eq="email"> 25 <mt:if name="template_type" eq="index"> 26 <a href="javascript:void(0)" 27 onclick="doForMarkedInThisWindow(getByID('<$mt:var name="template_type"$>-listing-form'), '<__trans phrase="template" escape="js">', '<__trans phrase="templates" escape="js">', 'id', 'publish_index_templates', {}, '<__trans phrase="to publish" escape="js">'); return false;" 28 accesskey="a" 29 title="<__trans phrase="Publish selected templates (a)">" 30 ><__trans phrase="Publish"></a> 31 <mt:else if name="template_type" eq="archive"> 32 <a href="javascript:void(0)" 33 onclick="doForMarkedInThisWindow(getByID('<$mt:var name="template_type"$>-listing-form'), '<__trans phrase="template" escape="js">', '<__trans phrase="templates" escape="js">', 'id', 'publish_archive_templates', {}, '<__trans phrase="to publish" escape="js">'); return false;" 34 accesskey="a" 35 title="<__trans phrase="Publish selected templates (a)">" 36 ><__trans phrase="Publish"></a> 37 </mt:if> 25 38 <a href="javascript:void(0)" 26 39 onclick="doRemoveItems(getByID('<$mt:var name="template_type"$>-listing-form'), '<__trans phrase="template" escape="js">', '<__trans phrase="templates" escape="js">'); return false;"
