introduce "full_text" property for comment, journal, story, submission

diff --git a/src/newslash_web/lib/Newslash/Model/Comments.pm b/src/newslash_web/lib/Newslash/Model/Comments.pm
index 0ca23d6..a9db58d 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Comments.pm
+++ b/src/newslash_web/lib/Newslash/Model/Comments.pm
@@ -184,6 +184,8 @@ sub _generalize {
     $c->{title} = $c->{subject};
     $c->{introtext} = $c->{comment};
     $c->{intro_text} = $c->{comment};
+    $c->{full_text} = $c->{intro_text};
+    $c->{fulltext} = $c->{full_text};
     $c->{public} => "yes";
 
     $c->{discussion_id} = $c->{sid};

diff --git a/src/newslash_web/lib/Newslash/Model/Journals.pm b/src/newslash_web/lib/Newslash/Model/Journals.pm
index b4da033..1ba47b3 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Journals.pm
+++ b/src/newslash_web/lib/Newslash/Model/Journals.pm
@@ -240,15 +240,21 @@ sub _generalize {
         $journal->{bodytext} = $self->article_to_bodytext($journal->{article},
                                                           $journal->{posttype},
                                                           {formatter => "modern"});
+        $journal->{fulltext} = $self->article_to_fulltext($journal->{article},
+                                                          $journal->{posttype},
+                                                          {formatter => "modern"});
     }
     elsif ($journal->{formatter} eq "legacy") {
         $journal->{introtext} = $self->article_to_introtext($journal->{article},
                                                           $journal->{posttype});
         $journal->{bodytext} = $self->article_to_bodytext($journal->{article},
                                                           $journal->{posttype});
+        $journal->{fulltext} = $self->article_to_fulltext($journal->{article},
+                                                          $journal->{posttype});
     }
     $journal->{intro_text} = $journal->{introtext}; # for compatible
     $journal->{body_text} = $journal->{bodytext}; # for compatible
+    $journal->{full_text} = $journal->{fulltext}; # for compatible
 
     $journal->{discussion_id} = $journal->{discussion};
 

diff --git a/src/newslash_web/lib/Newslash/Model/Stories.pm b/src/newslash_web/lib/Newslash/Model/Stories.pm
index f1a10c9..3a84fe3 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Stories.pm
+++ b/src/newslash_web/lib/Newslash/Model/Stories.pm
@@ -698,6 +698,8 @@ sub _generalize {
     $story->{content_type} = "story";
     $story->{intro_text} = $story->{introtext};
     $story->{body_text} = $story->{bodytext};
+    $story->{full_text} = join("\n", $story->{intro_text}, $story->{full_text});
+    $story->{fulltext} = $story->{full_text};
 
     $story->{discussion_id} = $story->{discussion};
 

diff --git a/src/newslash_web/lib/Newslash/Model/Submissions.pm b/src/newslash_web/lib/Newslash/Model/Submissions.pm
index e06e585..95ce499 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Submissions.pm
+++ b/src/newslash_web/lib/Newslash/Model/Submissions.pm
@@ -173,6 +173,8 @@ sub _generalize {
     $submission->{title} = $submission->{subj};
     $submission->{intro_text} = $submission->{story};
     $submission->{introtext} = $submission->{story}; # for compatible
+    $submission->{full_text} = $submission->{intro_text};
+    $submission->{fulltext} = $submission->{full_text};
 
     $submission->{drafttext} = $self->create_draft_text($submission);  # for compatible
     $submission->{draft_text} = $self->create_draft_text($submission);

diff --git a/src/newslash_web/templates/common/article/article.html.tt2 b/src/newslash_web/templates/common/article/article.html.tt2
index 8680cdc..7e88498 100644 (file)
--- a/src/newslash_web/templates/common/article/article.html.tt2
+++ b/src/newslash_web/templates/common/article/article.html.tt2
@@ -72,17 +72,18 @@ IF item.content_type == 'poll'; url = "/poll/" _ item.id _ "/"; END;
     [%- END -%]
   </div>
 
+  [%# TODO: fix intro_text, body_text, full_text process %]
+
+  [%- IF hide_bodytext %]
   [%- IF item.intro_text || x_template -%]
   <div class="body contents-text" v-html="item.intro_text">[% item.intro_text %]</div>
   [%- END -%]
-
-  [% IF item.body_text && !hide_bodytext %]
-  <div class="body contents-text" v-html="item.body_text">[% item.body_text %]</div>
-  [% END %]
-
-  [% IF item.media && !hide_bodytext %]
+  [%- ELSE %]
+  <div class="body contents-text" v-html="item.full_text">[% item.full_text %]</div>
+  [%- IF item.media || x_template %]
   <div class="body contents-text" v-html="item.media">[% item.media %]</div>
-  [% END %]
+  [%- END %]
+  [%- END %]
 
   [%- IF x_template -%]
   <div class="body contents-text" v-if="item.url"><p><a :href="item.url">情報元へのリンク</a></p></div>