fix: story cannot show for admin/editor user (#7299)

diff --git a/src/newslash_web/templates/common/article/article.html.tt2 b/src/newslash_web/templates/common/article/article.html.tt2
index 41f103b..32e77d5 100644 (file)
--- a/src/newslash_web/templates/common/article/article.html.tt2
+++ b/src/newslash_web/templates/common/article/article.html.tt2
@@ -86,11 +86,7 @@ END;
       </button>
       [%- END -%]
       [%- IF x_template || item.content_type == 'story' && user.is_admin || user.editor  -%]
-      <button type="button" class="btn btn-default btn-sm" id="activate-story-editor"
-              area-label="編集" title="編集" v-on:click="startEdit(item)"
-              v-if="0">
-        <span class="glyphicon glyphicon-cog" aria-hidden="true"></span>
-      </button>
+      <a href="/story/edit?stoid=[% item. stoid %]">[編集]</a>
       [%- END -%]
       [%- IF item.content_type == 'submission' && (user.author || x_template) -%]
       [<a href="/admin/story/edit?subid=[% item.submission_id %]">accept</a>]

diff --git a/src/newslash_web/templates/common/single.html.tt2 b/src/newslash_web/templates/common/single.html.tt2
index aca3667..fc97edf 100644 (file)
--- a/src/newslash_web/templates/common/single.html.tt2
+++ b/src/newslash_web/templates/common/single.html.tt2
@@ -1,10 +1,6 @@
 [%- WRAPPER common/layout -%]
 [%- INCLUDE common/components/comment_tree -%]
 
-[%- IF (item.content_type == 'journal' && item.uid == user.uid) || user.is_admin -%]
-[% INCLUDE common/components/article_item %]
-[% END -%]
-
 <div class="article-wrapper">
   <div class="content-wrapper">
     <div class="[% page.type %] [% page.content_type %] main-contents">
@@ -98,8 +94,4 @@
 <script>articleItem.addTrigger("#activate-journal-editor", {el: '#content-body'});</script>
 [%- END -%]
 
-[%- IF item.content_type == 'story' && user.is_admin -%]
-<script>articleItem.run({el: '#content-body'});</script>
-[%- END -%]
-
 [% END %]