Seiya Tashiro 7 years ago
parent
commit
ac7734daa3

+ 2 - 2
src/server/form/admin/markdownPresentation.js

@@ -4,6 +4,6 @@ var form = require('express-form')
   , field = form.field;
 
 module.exports = form(
-  field('markdownSetting[markdown:pageBreakSeparator]').trim().toInt(),
-  field('markdownSetting[markdown:pageBreakCustomSeparator]').trim()
+  field('markdownSetting[markdown:presentation:pageBreakSeparator]').trim().toInt(),
+  field('markdownSetting[markdown:presentation:pageBreakCustomSeparator]').trim()
 );

+ 4 - 4
src/server/models/config.js

@@ -116,8 +116,8 @@ module.exports = function(crowi) {
       'markdown:xss:attrWhiteList': [],
       'markdown:isEnabledLinebreaks': false,
       'markdown:isEnabledLinebreaksInComments': true,
-      'markdown:pageBreakSeparator': 1,
-      'markdown:pageBreakCustomSeparator': '',
+      'markdown:presentation:pageBreakSeparator': 1,
+      'markdown:presentation:pageBreakCustomSeparator': '',
     };
   }
 
@@ -360,7 +360,7 @@ module.exports = function(crowi) {
   };
 
   configSchema.statics.pageBreakSeparator = function(config) {
-    const key = 'markdown:pageBreakSeparator';
+    const key = 'markdown:presentation:pageBreakSeparator';
 
     // return default value if undefined
     if (undefined === config.markdown || undefined === config.markdown[key]) {
@@ -371,7 +371,7 @@ module.exports = function(crowi) {
   };
 
   configSchema.statics.pageBreakCustomSeparator = function(config) {
-    const key = 'markdown:pageBreakCustomSeparator';
+    const key = 'markdown:presentation:pageBreakCustomSeparator';
 
     // return default value if undefined
     if (undefined === config.markdown || undefined === config.markdown[key]) {

+ 3 - 3
src/server/views/admin/markdown.html

@@ -94,8 +94,8 @@
         <p class="well">{{ t("markdown_setting.presentation_setting_desc") }}</p>
 
         <fieldset class="form-group row my-2">
-            {% set nameForPageBreakOption = "markdownSetting[markdown:pageBreakSeparator]" %}
-            {% set pageBreakSeparator = markdownSetting['markdown:pageBreakSeparator'] %}
+            {% set nameForPageBreakOption = "markdownSetting[markdown:presentation:pageBreakSeparator]" %}
+            {% set pageBreakSeparator = markdownSetting['markdown:presentation:pageBreakSeparator'] %}
 
           <label class="col-xs-3 control-label">
             {{ t('markdown_setting.Page break setting') }}
@@ -127,7 +127,7 @@
               <p class="font-weight-bold">{{ t('markdown_setting.Custom separator') }}</p>
               <div class="m-t-15">
                   {{ t('markdown_setting.Custom separator desc') }}
-                  <input class="form-control" type="text" name="markdownSetting[markdown:pageBreakCustomSeparator]" value="{{markdownSetting['markdown:pageBreakCustomSeparator']|default('') }}">
+                  <input class="form-control" type="text" name="markdownSetting[markdown:presentation:pageBreakCustomSeparator]" value="{{markdownSetting['markdown:presentation:pageBreakCustomSeparator']|default('') }}">
               </div>
             </label>
           </div>