WESEEK Kaito 6 лет назад
Родитель
Сommit
4d3dde9832

+ 7 - 6
src/client/js/components/Admin/MarkdownSetting/MarkDownSetting.jsx

@@ -19,8 +19,6 @@ class MarkdownSetting extends React.Component {
     this.state = {
       isEnabledLinebreaks: appContainer.config.isEnabledLinebreaks,
       isEnabledLinebreaksInComments: appContainer.config.isEnabledLinebreaksInComments,
-      //isEnabledLinebreaks: false,
-      //isEnabledLinebreaksInComments: false,
       // TODO GW-220 get correct BreakOption value
       pageBreakOption: 1,
       // TODO GW-258 get correct custom regular expression
@@ -42,12 +40,15 @@ class MarkdownSetting extends React.Component {
     this.setState({ [name]: value });
   }
 
-  changeLineBreakSetting () {
+  async changeLineBreakSetting () {
+    const { appContainer } = this.props;
+    const params = {
+      isEnabledLinebreaks: this.state.isEnabledLinebreaks,
+      isEnabledLinebreaksInComments: this.state.isEnabledLinebreaksInComments,
+    };
     try {
-      this.props.appContainer.apiPost('/admin/markdown/lineBreaksSetting', { isEnabledLinebreaks: this.state.isEnabledLinebreaks });
+      await appContainer.apiPost('/admin/markdown/lineBreaksSetting', { params });
       toastSuccess('Success change line braek setting');
-      this.props.appContainer.apiPost('/admin/markdown/lineBreaksSetting', { isEnabledLinebreaksInComments: this.state.isEnabledLinebreaksInComments });
-      toastSuccess('Success change line braek setting in comments');
     }
     catch (err) {
       toastError(err);

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

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