sou 7 лет назад
Родитель
Сommit
63b9c3a406
2 измененных файлов с 14 добавлено и 3 удалено
  1. 6 0
      lib/routes/admin.js
  2. 8 3
      lib/views/admin/markdown.html

+ 6 - 0
lib/routes/admin.js

@@ -14,6 +14,7 @@ module.exports = function(crowi, app) {
     , PluginUtils = require('../plugins/plugin-utils')
     , PluginUtils = require('../plugins/plugin-utils')
     , pluginUtils = new PluginUtils()
     , pluginUtils = new PluginUtils()
     , ApiResponse = require('../util/apiResponse')
     , ApiResponse = require('../util/apiResponse')
+    , recommendedXssWhiteList = require('../util/recommendedXssWhiteList')
 
 
     , MAX_PAGE_LIST = 50
     , MAX_PAGE_LIST = 50
     , actions = {};
     , actions = {};
@@ -106,8 +107,13 @@ module.exports = function(crowi, app) {
   actions.markdown.index = function(req, res) {
   actions.markdown.index = function(req, res) {
     var config = crowi.getConfig();
     var config = crowi.getConfig();
     var markdownSetting = Config.setupCofigFormData('markdown', config);
     var markdownSetting = Config.setupCofigFormData('markdown', config);
+    var spacedRecommendedXssList = {
+      tags: recommendedXssWhiteList.tags.join(', '),
+      attrs: recommendedXssWhiteList.attrs.join(', ')
+    }
     return res.render('admin/markdown', {
     return res.render('admin/markdown', {
       markdownSetting: markdownSetting,
       markdownSetting: markdownSetting,
+      recommendedXssWhiteList: spacedRecommendedXssList,
     });
     });
   };
   };
 
 

+ 8 - 3
lib/views/admin/markdown.html

@@ -153,13 +153,13 @@
                 <div>
                 <div>
                   {{ t('markdown_setting.Tag names') }}
                   {{ t('markdown_setting.Tag names') }}
                   <div>
                   <div>
-                    <textarea class="form-control" type="text" name="recommendedTags" rows="5" cols="40" readonly>{{ markdownSetting['markdown:xss:recommendedTagWhiteList'] }}</textarea>
+                    <textarea class="form-control" name="recommendedTags" rows="5" cols="40" readonly>{{ recommendedXssWhiteList.tags }}</textarea>
                   </div>
                   </div>
                 </div>
                 </div>
                 <div>
                 <div>
                   {{ t('markdown_setting.Tag attributes') }}
                   {{ t('markdown_setting.Tag attributes') }}
                   <div>
                   <div>
-                    <textarea class="form-control" name="recommendedAttrs" rows="5" cols="40" readonly>{{ markdownSetting['markdown:xss:recommendedAttrWhiteList'] }}</textarea>
+                    <textarea class="form-control" name="recommendedAttrs" rows="5" cols="40" readonly>{{ recommendedXssWhiteList.attrs }}</textarea>
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>
@@ -239,7 +239,12 @@
     }
     }
   });
   });
 
 
-  $('#btn-import-attrs')
+  $('#btn-import-tags').on('click', () => {
+    $('textarea[name="markdownSetting[markdown:xss:tagWhiteList]"]').val($('textarea[name="recommendedTags"]').val());
+  });
+  $('#btn-import-attrs').on('click', () => {
+    $('textarea[name="markdownSetting[markdown:xss:attrWhiteList]"]').val($('textarea[name="recommendedAttrs"]').val());
+  });
 </script>
 </script>
 {% endblock content_main %}
 {% endblock content_main %}