yusuketk 7 лет назад
Родитель
Сommit
8f57dd9c1f
3 измененных файлов с 6 добавлено и 4 удалено
  1. 3 1
      src/client/js/app.js
  2. 2 3
      src/client/js/components/SavePageControls.jsx
  3. 1 0
      src/server/routes/page.js

+ 3 - 1
src/client/js/app.js

@@ -63,6 +63,7 @@ let pagePath;
 let pageContent = '';
 let pageContent = '';
 let markdown = '';
 let markdown = '';
 let slackChannels;
 let slackChannels;
+let pageTags = '';
 if (mainContent !== null) {
 if (mainContent !== null) {
   pageId = mainContent.getAttribute('data-page-id') || null;
   pageId = mainContent.getAttribute('data-page-id') || null;
   pageRevisionId = mainContent.getAttribute('data-page-revision-id');
   pageRevisionId = mainContent.getAttribute('data-page-revision-id');
@@ -72,6 +73,7 @@ if (mainContent !== null) {
   hasDraftOnHackmd = !!mainContent.getAttribute('data-page-has-draft-on-hackmd');
   hasDraftOnHackmd = !!mainContent.getAttribute('data-page-has-draft-on-hackmd');
   pagePath = mainContent.attributes['data-path'].value;
   pagePath = mainContent.attributes['data-path'].value;
   slackChannels = mainContent.getAttribute('data-slack-channels') || '';
   slackChannels = mainContent.getAttribute('data-slack-channels') || '';
+  // pageTags = mainContent.getAttribute('data-page-tags') || '';
   const rawText = document.getElementById('raw-text-original');
   const rawText = document.getElementById('raw-text-original');
   if (rawText) {
   if (rawText) {
     pageContent = rawText.innerHTML;
     pageContent = rawText.innerHTML;
@@ -324,7 +326,7 @@ if (savePageControlsElem) {
               savePageControls = elem.getWrappedInstance();
               savePageControls = elem.getWrappedInstance();
             }
             }
           }}
           }}
-          pageId={pageId} pagePath={pagePath} slackChannels={slackChannels}
+          pageId={pageId} pagePath={pagePath} slackChannels={slackChannels} pageTags={pageTags}
           grant={grant} grantGroupId={grantGroupId} grantGroupName={grantGroupName} />
           grant={grant} grantGroupId={grantGroupId} grantGroupName={grantGroupName} />
     </I18nextProvider>,
     </I18nextProvider>,
     savePageControlsElem
     savePageControlsElem

+ 2 - 3
src/client/js/components/SavePageControls.jsx

@@ -29,8 +29,7 @@ class SavePageControls extends React.PureComponent {
 
 
   getCurrentOptionsToSave() {
   getCurrentOptionsToSave() {
     const slackNotificationOptions = this.refs.slackNotification.getCurrentOptionsToSave();
     const slackNotificationOptions = this.refs.slackNotification.getCurrentOptionsToSave();
-    // const pageTagOptions = this.refs.pageTagForm.getCurrentOptionsToSave();
-    const pageTagOptions = '';
+    const pageTagOptions = this.refs.pageTagForm.getCurrentOptionsToSave();
     const grantSelectorOptions = this.refs.grantSelector.getCurrentOptionsToSave();
     const grantSelectorOptions = this.refs.grantSelector.getCurrentOptionsToSave();
     return Object.assign(slackNotificationOptions, pageTagOptions, grantSelectorOptions);
     return Object.assign(slackNotificationOptions, pageTagOptions, grantSelectorOptions);
   }
   }
@@ -63,7 +62,7 @@ class SavePageControls extends React.PureComponent {
       <div className="d-flex align-items-center form-inline">
       <div className="d-flex align-items-center form-inline">
         <div className="mr-2">
         <div className="mr-2">
           <PageTagForm
           <PageTagForm
-            ref='PageTagForm'
+            ref='pageTagForm'
             crowi={this.props.crowi}
             crowi={this.props.crowi}
             pageId={this.props.pageId}
             pageId={this.props.pageId}
             pagePath={this.props.pagePath}
             pagePath={this.props.pagePath}

+ 1 - 0
src/server/routes/page.js

@@ -595,6 +595,7 @@ module.exports = function(crowi, app) {
     const overwriteScopesOfDescendants = req.body.overwriteScopesOfDescendants || null;
     const overwriteScopesOfDescendants = req.body.overwriteScopesOfDescendants || null;
     const isSlackEnabled = !!req.body.isSlackEnabled;                     // cast to boolean
     const isSlackEnabled = !!req.body.isSlackEnabled;                     // cast to boolean
     const slackChannels = req.body.slackChannels || null;
     const slackChannels = req.body.slackChannels || null;
+    const pageTags = req.body.pageTags || null;
     const isSyncRevisionToHackmd = !!req.body.isSyncRevisionToHackmd;     // cast to boolean
     const isSyncRevisionToHackmd = !!req.body.isSyncRevisionToHackmd;     // cast to boolean
     const socketClientId = req.body.socketClientId || undefined;
     const socketClientId = req.body.socketClientId || undefined;