itizawa 6 лет назад
Родитель
Сommit
778abb1be3
3 измененных файлов с 10 добавлено и 9 удалено
  1. 7 6
      src/server/routes/admin.js
  2. 1 1
      src/server/routes/index.js
  3. 2 2
      src/server/views/admin/markdown.html

+ 7 - 6
src/server/routes/admin.js

@@ -132,15 +132,16 @@ module.exports = function(crowi, app) {
   // app.post('/admin/markdown/lineBreaksSetting' , admin.markdown.lineBreaksSetting);
   actions.markdown.lineBreaksSetting = async function(req, res) {
 
-    const array = req.body.params;
+    const markdownSetting = req.form.markdownSetting;
 
-    try {
-      await configManager.updateConfigsInTheSameNamespace('markdown', array);
-      return res.json(ApiResponse.success());
+    if (req.form.isValid) {
+      await configManager.updateConfigsInTheSameNamespace('markdown', markdownSetting);
+      req.flash('successMessage', ['Successfully updated!']);
     }
-    catch (err) {
-      return res.json(ApiResponse.error(err));
+    else{
+      req.flash('errorMessage', req.form.errors);
     }
+    return res.redirect('/admin/markdown');
 
   };
 

+ 1 - 1
src/server/routes/index.js

@@ -92,7 +92,7 @@ module.exports = function(crowi, app) {
 
   // markdown admin
   app.get('/admin/markdown'                   , loginRequiredStrictly , adminRequired , admin.markdown.index); // TODO delete
-  app.post('/_api/admin/markdown/lineBreaksSetting', loginRequiredStrictly , adminRequired , csrf, form.admin.markdown, admin.markdown.lineBreaksSetting); // change form name
+  app.post('/admin/markdown/lineBreaksSetting', loginRequiredStrictly , adminRequired , csrf, form.admin.markdown, admin.markdown.lineBreaksSetting); // change form name
   app.post('/admin/markdown/xss-setting'      , loginRequiredStrictly , adminRequired , csrf, form.admin.markdownXss, admin.markdown.xssSetting);
   app.post('/admin/markdown/presentationSetting', loginRequiredStrictly , adminRequired , csrf, form.admin.markdownPresentation, admin.markdown.presentationSetting);
 

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

@@ -17,8 +17,8 @@
     <div class="col-md-3">
       {% include './widget/menu.html' with {current: 'markdown'} %}
     </div>
-    <div class="col-md-9" id="admin-markdown-setting">
-      <!-- TODO Delete html after reactfy -->
+    <!-- TODO reactify admin -->
+    <div class="col-md-9">
       {% set smessage = req.flash('successMessage') %}
       {% if smessage.length %}
       <div class="alert alert-success">