Changeset 500

Timestamp:

08/21/08 20:12:02 (3 months ago)

Author:

ogawa

Message:

Rename tmpl/create_widget.tmpl to tmpl/dialog_create_widget.tmpl
Rename WidgetSetExtension::CMS methods.

Location:

WidgetSetExtension/trunk/plugins/WidgetSetExtension

Files:

• lib/WidgetSetExtension/CMS.pm (modified) (5 diffs)
• tmpl/dialog_create_widget.tmpl (moved) (moved from WidgetSetExtension/trunk/plugins/WidgetSetExtension/tmpl/create_widget.tmpl) (1 diff)
• tmpl/finish_create_widget.tmpl (deleted)
• widget_set_extension.pl (modified) (1 diff)

WidgetSetExtension/trunk/plugins/WidgetSetExtension/lib/WidgetSetExtension/CMS.pm

@@ -7 +7 @@
 use MT::Template;
 
-sub start_create_widget {
+sub dialog_create_widget {
     my $app   = shift;
-    my $perms = $app->permissions
-      or return $app->error( $app->translate("No permissions") );
-    return $app->error( $app->translate("Permission denied.") )
-      unless $perms->can_edit_templates;
+
+    # check permissions
+    my $perms = $app->permissions;
+    return $app->errtrans("Permission denied.")
+      unless $app->user->is_superuser()
+          || $app->user->can_edit_templates()
+          || (
+              $perms
+              && (   $perms->can_edit_templates()
+                  || $perms->can_administer_blog() )
+          );
 
     my $plugin = MT::Plugin::WidgetSetExtension->instance;
@@ -45 +52 @@
 };
 
-    my $tmpl = $plugin->load_tmpl('create_widget.tmpl');
+    my $tmpl = $plugin->load_tmpl('dialog_create_widget.tmpl');
     $app->build_page(
         $tmpl,
@@ -58 +65 @@
 }
 
-sub create_widget {
+sub finish_create_widget {
     my $app = shift;
-    $app->validate_magic() or return;
-    my $perms = $app->permissions
-      or return $app->error( $app->translate("No permissions") );
-    return $app->error( $app->translate("Permission denied.") )
-      unless $perms->can_edit_templates;
+    $app->validate_magic or return;
+
+    # check permissions
+    my $perms = $app->permissions;
+    return $app->errtrans("Permission denied.")
+      unless $app->user->is_superuser()
+          || $app->user->can_edit_templates()
+          || (
+              $perms
+              && (   $perms->can_edit_templates()
+                  || $perms->can_administer_blog() )
+          );
 
     my $q = $app->param;
@@ -86 +100 @@
     }
 
-    my $plugin = MT::Plugin::WidgetSetExtension->instance;
-    my $tmpl   = $plugin->load_tmpl('finish_create_widget.tmpl');
-    $app->build_page( $tmpl, { return_args => $q->param('return_args') } );
+    $app->add_return_arg( 'refreshed' => 1 );
+    $app->call_return;
 }
 
@@ -95 +108 @@
     my $pattern = qq{<div id="edit-form">};
     my $append  = qq{
-    <p><a href="javascript:void(0)" onclick="return openDialog(false, 'start_create_widget', 'blog_id=<mt:var name="blog_id" escape="url">&amp;id=<mt:var name="id" escape="url">&amp;return_args=<mt:var name="return_args" escape="url">')" class="icon-left icon-create"><__trans phrase="Create widget template"></a></p>
+    <p><a href="javascript:void(0)" onclick="return openDialog(false, 'dialog_create_widget', 'blog_id=<mt:var name="blog_id" escape="url">&amp;id=<mt:var name="id" escape="url">&amp;return_args=<mt:var name="return_args" escape="url">')" class="icon-left icon-create"><__trans phrase="Create widget template"></a></p>
 };
     $$tmpl =~ s/$pattern/$pattern$append/;

WidgetSetExtension/trunk/plugins/WidgetSetExtension/tmpl/dialog_create_widget.tmpl

@@ +1 @@
+<mt:var name="page_title" value="<__trans phrase="Create widget template">">
 <mt:include name="dialog/header.tmpl">
-<mt:setvarblock name="page_title"><__trans phrase="Create widget template"></mt:setvarblock>
 
-<h3><__trans phrase="Create widget template"></h3>
-
-<form method="post" enctype="multipart/form-data" action="<mt:var name="script_url">">
-    <input type="hidden" name="__mode" value="create_widget" />
+<form name="widget_form" id="widget_form" method="post" action="<mt:var name="script_url">" enctype="multipart/form-data" target="_top">
+    <input type="hidden" name="__mode" value="finish_create_widget" />
     <input type="hidden" name="blog_id" value="<mt:var name="blog_id">" />
     <input type="hidden" name="id" value="<mt:var name="id">" />
+    <input type="hidden" name="magic_token" value="<mt:var name="magic_token">" />
     <input type="hidden" name="return_args" value="<mt:var name="return_args" escape="html">" />
-    <input type="hidden" name="magic_token" value="<mt:var name="magic_token">" />
 
     <mtapp:setting

WidgetSetExtension/trunk/plugins/WidgetSetExtension/widget_set_extension.pl

@@ -40 +40 @@
                 cms => {
                     methods => {
-                        'start_create_widget' =>
-                          'WidgetSetExtension::CMS::start_create_widget',
-                        'create_widget' =>
-                          'WidgetSetExtension::CMS::create_widget',
+                        'dialog_create_widget' =>
+                          'WidgetSetExtension::CMS::dialog_create_widget',
+                        'finish_create_widget' =>
+                          'WidgetSetExtension::CMS::finish_create_widget',
                     }
                 }