Changeset 2859

Timestamp:

07/29/08 20:50:43 (4 months ago)

Author:

arvind

Message:

Abstracted code that generates entry live preview into two routines:
* _create_temp_entry creates a temporary MT::Entry from posted values
* _build_entry_preview builds the actual live preview file

Files:

• branches/feature-revision-histories/lib/MT/CMS/Entry.pm (modified) (7 diffs)

branches/feature-revision-histories/lib/MT/CMS/Entry.pm

@@ -730 +730 @@
-
-sub preview {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    my $q           = $app->param;
-    my $type        = $q->param('_type') || 'entry';
@@ -737 +785 @@
-    my $blog        = $app->blog;
-    my $id          = $q->param('id');
-    my $entry;
-    my $user_id = $app->user->id;
-
-    if ($id) {
-        $entry = $entry_class->load( { id => $id, blog_id => $blog_id } )
-            or return $app->errtrans( "Invalid request." );
-        $user_id = $entry->author_id;
-    }
-    else {
-        $entry = $entry_class->new;
-        $entry->author_id($user_id);
-        $entry->id(-1); # fake out things like MT::Taggable::__load_tags
-        $entry->blog_id($blog_id);
-    }
-    my $cat;
-    my $names = $entry->column_names;
-
-    my %values = map { $_ => scalar $app->param($_) } @$names;
-    delete $values{'id'} unless $q->param('id');
-    ## Strip linefeed characters.
-    for my $col (qw( text excerpt text_more keywords )) {
-        $values{$col} =~ tr/\r//d if $values{$col};
-    }
-    $values{allow_comments} = 0
-      if !defined( $values{allow_comments} )
-      || $q->param('allow_comments') eq '';
-    $values{allow_pings} = 0
-      if !defined( $values{allow_pings} )
-      || $q->param('allow_pings') eq '';
-    $entry->set_values( \%values );
-
-    my $cat_ids = $q->param('category_ids');
-    if ($cat_ids) {
@@ -861 +880 @@
-    $ctx->var('preview_template',  1);
-    my $html = $tmpl->output;
-    my %param;
-    unless ( defined($html) ) {
-        my $preview_error = $app->translate( "Publish error: [_1]",
@@ -964 +982 @@
-          || $col eq 'meta'
-          || $col eq 'comment_count'
-
+
+
-        if ( $col eq 'basename' ) {
-            if (   ( !defined $q->param('basename') )
@@ -1020 +1039 @@
-    $param{object_type}  = $type;
-    $param{object_label} = $entry_class->class_label;
+    
+    $param{diff_view} = $app->param('rev_numbers') || $app->param('collision');
+    $param{collision} = 1;
+    if(my @rev_numbers = split /,/, $app->param('rev_numbers')) {
+        $param{comparing_revisions} = 1;
+        $param{rev_a} = $rev_numbers[0];
+        $param{rev_b} = $rev_numbers[1];
+    }
+    
-    if ($fullscreen) {
-        return $app->load_tmpl( 'preview_entry.tmpl', \%param );
@@ -1264 +1292 @@
-    $app->_translate_naughty_words($obj);
-
-    $obj->modified_by( $author->id ) unless $is_new;
-
-    $app->run_callbacks( 'cms_pre_save.' . $type, $app, $obj, $orig_obj )
-      || return $app->error(
@@ -1273 +1299 @@
-        )
-      );
+      
+    # Setting modified_by updates modified_on which we want to do before
+    # a save but after pre_save callbacks fire.  
+    $obj->modified_by( $author->id ) unless $is_new;
-
-    $obj->save