fix to show link to parent page when content is poll (#7294)

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/Comment.pm b/src/newslash_web/lib/Newslash/Web/Controller/Comment.pm
index fc4b086..30389d3 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/Comment.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/Comment.pm
@@ -1,6 +1,7 @@
 package Newslash::Web::Controller::Comment;
 use Mojo::Base 'Mojolicious::Controller';
 use Mojo::Util qw(dumper);
+use Data::Dumper;
 
 sub single {
     my $c = shift;
@@ -30,16 +31,17 @@ sub single {
     my $parent_item;
     if ($discuss) {
         my $d_id = $discuss->{discussion_id};
-        if ($discuss->{kind} eq "story"
+        if ($discuss->{kind} eq "poll"
+               || $discuss->{url} =~ m|^/poll/|) {
+            $parent_item = $c->model('polls')->select(discussion_id => $d_id);
+        }
+        elsif ($discuss->{kind} eq "story"
             || $discuss->{kind} eq "journal-story") {
             $parent_item = $c->model('stories')->select(stoid => $discuss->{stoid});
         }
         elsif ($discuss->{kind} eq "journal") {
             $parent_item = $c->model('journals')->select(discussion_id => $d_id);
         }
-        elsif ($discuss->{kind} eq "poll") {
-            $parent_item = $c->model('polls')->select(discussion_id => $d_id);
-        }
         elsif ($discuss->{kind} eq "submission") {
             $parent_item = $c->model('submissions')->select(discussion_id => $d_id);
         }

diff --git a/src/newslash_web/templates/common/single.html.tt2 b/src/newslash_web/templates/common/single.html.tt2
index cd88030..acd782c 100644 (file)
--- a/src/newslash_web/templates/common/single.html.tt2
+++ b/src/newslash_web/templates/common/single.html.tt2
@@ -18,7 +18,7 @@
         [%- ELSIF discussion.kind == "journal" -%]
         日記「<span><a href="/journal/[% parent_item.id %]">[% parent_item.title %]</a></span>」
         [%- ELSIF discussion.kind == "poll" -%]
-        国民投票「<span><a href="/journal/[% parent_item.id %]">[% parent_item.title %]</a></span>」
+        国民投票「<span><a href="/poll/[% parent_item.id %]">[% parent_item.title %]</a></span>」
         [%- ELSIF discussion.kind == "submission" -%]
         タレコミ「<span><a href="/journal/[% parent_item.id %]">[% parent_item.title %]</a></span>」
         [%- ELSE -%]