Bladeren bron

renderVars.slack = page.extended.slack || join all channels on admin

sou 7 jaren geleden
bovenliggende
commit
532d31c8fd
3 gewijzigde bestanden met toevoegingen van 16 en 12 verwijderingen
  1. 14 10
      lib/routes/page.js
  2. 1 1
      lib/views/_form.html
  3. 1 1
      lib/views/widget/page_content.html

+ 14 - 10
lib/routes/page.js

@@ -255,7 +255,6 @@ module.exports = function(crowi, app) {
       tree: [],
       pageRelatedGroup: null,
       template: null,
-      slack: '',
     };
 
     var pageTeamplate = 'customlayout-selector/page';
@@ -291,6 +290,20 @@ module.exports = function(crowi, app) {
             renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
           }
         })
+        .then(() => {
+          if (page.extended.slack) {
+            renderVars.slack = page.extended.slack;
+            return;
+          }
+          else {
+            return UpdatePost.findSettingsByPath(page.path)
+            .then(function(data) {
+              renderVars.slack = data.map(e => e.channel).join(',');
+            }).catch(function(err) {
+              debug('Error occured in getting slack channels', err);
+            });
+          }
+        })
         .then(function() {
           var userPage = isUserPage(page.path);
           var userData = null;
@@ -355,15 +368,6 @@ module.exports = function(crowi, app) {
 
             return;
           })
-          .then(() => {
-            return UpdatePost.findSettingsByPath(renderVars.path)
-              .then(function(data) {
-                data = data.map(e => e.channel);
-                renderVars.slack = data.join(',');
-              }).catch(function(err) {
-                debug('Error occured in getting slack channels', err);
-              });
-          })
           .then(function() {
             return interceptorManager.process('beforeRenderPage', req, res, renderVars);
           })

+ 1 - 1
lib/views/_form.html

@@ -35,7 +35,7 @@
           <img id="slack-mark-black" src="/images/icons/slack/mark-monochrome_black.svg" width="18" height="18">
           <input class="" type="checkbox" name="pageForm[notify][slack][on]" value="1">
         </label>
-        <input class="form-control" type="text" name="pageForm[notify][slack][channel]" value="{{ slack }}" placeholder="slack-channel-name"
+        <input class="form-control" type="text" name="pageForm[notify][slack][channel]" value="{{ slack|default('') }}" placeholder="slack-channel-name"
           id="page-form-slack-channel"
           data-toggle="popover"
           title="Slack通知"

+ 1 - 1
lib/views/widget/page_content.html

@@ -6,7 +6,7 @@
   data-page-revision-id="{% if revision %}{{ revision._id.toString() }}{% endif %}"
   data-page-revision-created="{% if revision %}{{ revision.createdAt|datetz('U') }}{% endif %}"
   data-page-is-seen="{% if page and page.isSeenUser(user) %}1{% else %}0{% endif %}"
-  data-slack-channels="{{ slack }}"
+  data-slack-channels="{{ slack|default('') }}"
   >
 
   {% include 'page_alerts.html' %}