Changeset 2726

Timestamp:

07/08/08 05:52:25 (19 months ago)

Author:

bchoate

Message:

Return asset immediately if asset_select parameter is given (skips options dialog). BugId:80550

Location:

branches/release-41

Files:

• lib/MT/CMS/Asset.pm (modified) (2 diffs)
• tmpl/cms/dialog/asset_options.tmpl (modified) (1 diff)

branches/release-41/lib/MT/CMS/Asset.pm

@@ -230 +230 @@
     my $text = _process_post_upload( $app );
     return unless defined $text;
-    $app->load_tmpl(
+    my $tmpl = $app->load_tmpl(
         'dialog/asset_insert.tmpl',
         {
+            
             upload_html => $text || '',
             edit_field => scalar $app->param('edit_field') || '',
         },
     );
+    my $ctx = $tmpl->context;
+    my $id = $app->param('id')
+        or return $app->errtrans("Invalid request.");
+    my $asset = MT::Asset->load( $id );
+    $ctx->stash('asset', $asset);
+    return $tmpl;
 }
 
@@ -336 +343 @@
     my $perms = $app->permissions
       or return $app->errtrans('No permissions');
+
+    # caller wants asset without any option step, so insert immediately
+    return insert($app) if $app->param('asset_select');
 
     my $param = {

branches/release-41/tmpl/cms/dialog/asset_options.tmpl

@@ -87 +87 @@
 
 <mt:unless name="direct_asset_insert">
-<!-- <__trans phrase="The file named '[_1]' has been uploaded. Size: [quant,_2,byte,bytes]." params="<mt:var name="fname" escape="html">%%<mt:var name="bytes">"> -->
-</mt:unless>
-
-<mt:unless name="direct_asset_insert">
     <div>
         <div id="asset_details">