Changeset 4156 for trunk/lib/MT/CMS

Timestamp:

08/29/09 00:42:22 (7 months ago)

Author:

fumiakiy

Message:

Mereged hanson to trunk. "svn merge -r4124:4151 http://code.sixapart.com/svn/movabletype/branches/hanson ."

Location:

trunk/lib/MT/CMS

Files:

• Asset.pm (modified) (2 diffs)
• Comment.pm (modified) (1 diff)
• Entry.pm (modified) (3 diffs)
• Tools.pm (modified) (2 diffs)

trunk/lib/MT/CMS/Asset.pm

@@ -1035 +1035 @@
                     $target_file =~ s/$ext_old/$ext_temp/;
                     $relative_path =~ s/$ext_old/$ext_temp/;
+                    $relative_url =~ s/$ext_old/$ext_temp/;
                     $asset_file =~ s/$ext_old/$ext_temp/;
                     $basename =~ s/$ext_old/$ext_temp/;
@@ -1272 +1273 @@
         $asset->file_ext($ext);
         $asset->blog_id($blog_id);
+        $asset->label($local_basename);
         $asset->created_by( $app->user->id );
     }

trunk/lib/MT/CMS/Comment.pm

@@ -316 +316 @@
 
     my %terms;
+
+    if ( !$app->param('blog_id') && !$app->user->is_superuser ) {
+        require MT::Permission;
+        $terms{blog_id} = [
+            map { $_->blog_id }
+              grep { $_->can_view_feedback }
+              MT::Permission->load( { author_id => $app->user->id } )
+        ];
+    }
+
     my $filter_col = $app->param('filter');
     if ( $filter_col && ( my $val = $app->param('filter_val') ) ) {

trunk/lib/MT/CMS/Entry.pm

@@ -181 +181 @@
        require MT::ObjectAsset;
        my $assets =();
-       if ($q->param('asset_id') && !$id) {
+       if ($q->param('reedit') && $q->param('include_asset_ids')) {
+           my $include_asset_ids = $app->param('include_asset_ids');
+           my @asset_ids = split(',', $include_asset_ids);
+           foreach my $asset_id (@asset_ids) {
+               my $asset = MT::Asset->load($asset_id);
+               if ($asset) {
+                   my $asset_1;
+                   if ($asset->class eq 'image') {
+                       $asset_1 = {asset_id => $asset->id, asset_name => $asset->file_name, asset_thumb => $asset->thumbnail_url(Width=>100)};
+                   } else {
+                       $asset_1 = {asset_id => $asset->id, asset_name => $asset->file_name};
+                   }
+                   push @{$assets}, $asset_1;
+               }
+           }
+       }
+       elsif ($q->param('asset_id') && !$id) {
            my $asset = MT::Asset->load($q->param('asset_id'));
            my $asset_1 = {asset_id => $asset->id, asset_name => $asset->file_name};
            push @{$assets}, $asset_1;
        }
-       if ($id) {
+       elsif ($id) {
            my @assets = MT::Asset->load({ class => '*' },
                                         { join => MT::ObjectAsset->join_on(undef, {asset_id => \'= asset_id', object_ds => 'entry', object_id => $id })});
@@ -201 +217 @@
        $param->{asset_loop} = $assets;
     }
-
+    
     ## Load categories and process into loop for category pull-down.
     require MT::Placement;
@@ -1120 +1136 @@
     }
     for my $data (
-        qw( authored_on_date authored_on_time basename_manual basename_old category_ids tags )
+        qw( authored_on_date authored_on_time basename_manual basename_old category_ids tags include_asset_ids )
       )
     {

trunk/lib/MT/CMS/Tools.pm

@@ -124 +124 @@
         $tmpl = $app->load_tmpl( 'cms/dialog/recover.tmpl' );
     }
+    $param->{system_template} = 1;
     $tmpl->param($param);
     return $tmpl;
@@ -320 +321 @@
         $tmpl = $app->load_tmpl( 'cms/dialog/new_password.tmpl' );
     }
+    $param->{system_template} = 1;
     $tmpl->param($param);
     return $tmpl;