From da0882adf4b1cd588d679e331c40548d189a1c16 Mon Sep 17 00:00:00 2001
From: hylom <hylom@users.sourceforge.jp>
Date: Wed, 5 Apr 2017 00:24:39 +0900
Subject: [PATCH] template: fix to work

---
 src/newslash_web/public/js/comments.js               | 20 +++++++-------------
 .../templates/common/comment/comments.html.tt2       | 20 +++++++++++++-------
 .../common/components/content_editor.html.tt2        |  2 +-
 .../common/components/journal_editor.html.tt2        |  2 +-
 src/newslash_web/templates/common/core_js.html.tt2   |  5 +++++
 .../templates/submission/submission.html.tt2         |  1 +
 6 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/newslash_web/public/js/comments.js b/src/newslash_web/public/js/comments.js
index 2d3c01d9..d4e9772f 100644
--- a/src/newslash_web/public/js/comments.js
+++ b/src/newslash_web/public/js/comments.js
@@ -286,23 +286,17 @@ comments.initializeComments = function initializeComments (comments, params) {
 }
 
 comments.run = function run (params) {
-  const userConfig = params.userConfig || {};
-  const user = params.user || {};
-  const article = params.article || {};
-  const discussion = params.discussion || {};
-  const data = {
-    type: article.type,
-    stoid: article.stoid,
-    sid: article.sid,
-    discussion_id: discussion.id,
+  var data = {
+    userConfig: params.userConfig || {},
+    user: params.user || {},
+    type: params.type,
+    discussion_id: params.discussion_id,
+    archived: params.archived,
+    modReasons: params.modReasons,
     comments: [],
-    archived: article.archived,
     rootReply: this.blankReply(),
-    userConfig: userConfig,
     showConfig: 0,
-    user: user,
     configMessage: "",
-    modReasons: params.modReasons,
     urls: {
       commentPost: "/api/v1/comment",
       configSave: "/api/v1/user",
diff --git a/src/newslash_web/templates/common/comment/comments.html.tt2 b/src/newslash_web/templates/common/comment/comments.html.tt2
index 3655c5c1..151c5a08 100644
--- a/src/newslash_web/templates/common/comment/comments.html.tt2
+++ b/src/newslash_web/templates/common/comment/comments.html.tt2
@@ -31,16 +31,22 @@
 
 <script src="/js/comments.js" ></script>
 
+[%
+IF discussion.discussion_id; discussion_id = discussion.discussion_id;
+ELSE; discussion_id = 0;
+END;
+IF discussion.type == 'open'; archived = 0;
+ELSE; archived = 1;
+END
+%]
+
 <script>
   comments.run({ el: "#comments",
   userConfig: userConfig,
   user: user,
-  article: article,
-  discussion: discussion,
-  modReasons: {
-    [%- FOREACH item IN moderate_reasons -%]
-    [% item.key %] : "[% item.value.name %]",
-    [%- END -%]
-  },
+  type: "[% discussion.kind %]",
+  discussion_id: [% discussion_id %],
+  archived: [% archived %],
+  modReasons: modReasons,
   });
 </script>
diff --git a/src/newslash_web/templates/common/components/content_editor.html.tt2 b/src/newslash_web/templates/common/components/content_editor.html.tt2
index 1c81a041..1dcd0185 100644
--- a/src/newslash_web/templates/common/components/content_editor.html.tt2
+++ b/src/newslash_web/templates/common/components/content_editor.html.tt2
@@ -1,5 +1,5 @@
 <script type="text/x-template" id="content-editor">
-[% INCLUDE journal/editor %]
+[% INCLUDE common/journal/editor %]
 </script>
 <script src="/js/content-editor.js" ></script>
 <script>
diff --git a/src/newslash_web/templates/common/components/journal_editor.html.tt2 b/src/newslash_web/templates/common/components/journal_editor.html.tt2
index 4a8ff7ab..c8c1f98f 100644
--- a/src/newslash_web/templates/common/components/journal_editor.html.tt2
+++ b/src/newslash_web/templates/common/components/journal_editor.html.tt2
@@ -1,5 +1,5 @@
 <script type="text/x-template" id="content-editor">
-[% INCLUDE journal/editor x_template=1%]
+[% INCLUDE common/journal/editor x_template=1%]
 </script>
 <script src="/js/content-editor.js" ></script>
 <script>
diff --git a/src/newslash_web/templates/common/core_js.html.tt2 b/src/newslash_web/templates/common/core_js.html.tt2
index bcd970dd..411a9d3e 100644
--- a/src/newslash_web/templates/common/core_js.html.tt2
+++ b/src/newslash_web/templates/common/core_js.html.tt2
@@ -10,4 +10,9 @@
     [%- END %]
   };
   var siteInfo = { topic_icon_base_url: "[% Site.topic_icon_base_url %]", };
+  var modReasons = {
+    [%- FOREACH item IN moderate_reasons -%]
+    [% item.key %] : "[% item.value.name %]",
+    [%- END -%]
+  };
 </script>
diff --git a/src/newslash_web/templates/submission/submission.html.tt2 b/src/newslash_web/templates/submission/submission.html.tt2
index 888fac71..a123919d 100644
--- a/src/newslash_web/templates/submission/submission.html.tt2
+++ b/src/newslash_web/templates/submission/submission.html.tt2
@@ -1,4 +1,5 @@
 [% WRAPPER common/layout enable_sidebar=1 %]
+[% INCLUDE common/vars use={submission = ["submission_id"]} %]
 
 <div class="main-column">
   <div class="submission main-contents">
-- 
2.11.0