Steven Fukase 4 лет назад
Родитель
Сommit
0eb63bf12f

+ 7 - 7
packages/app/src/server/models/user.js

@@ -36,7 +36,7 @@ module.exports = function(crowi) {
   }
   }
 
 
   const editorCurrentSettingsSchema = new mongoose.Schema({
   const editorCurrentSettingsSchema = new mongoose.Schema({
-    isTextLintEnable: { type: Boolean, default: true },
+    isTextlintEnabled: { type: Boolean, default: true },
   });
   });
 
 
   const userSchema = new mongoose.Schema({
   const userSchema = new mongoose.Schema({
@@ -342,6 +342,12 @@ module.exports = function(crowi) {
     return this.save();
     return this.save();
   };
   };
 
 
+  userSchema.methods.updateEditorCurrentSettings = async function(editorSettings) {
+    this.editorCurrentSettings = editorSettings;
+    const userData = await this.save();
+    return userData;
+  };
+
   userSchema.statics.getUserStatusLabels = function() {
   userSchema.statics.getUserStatusLabels = function() {
     const userStatus = {};
     const userStatus = {};
     userStatus[STATUS_REGISTERED] = 'Approval Pending';
     userStatus[STATUS_REGISTERED] = 'Approval Pending';
@@ -698,12 +704,6 @@ module.exports = function(crowi) {
     user.save();
     user.save();
   };
   };
 
 
-  userSchema.methods.updateEditorCurrentSettings = async function(editorSettings) {
-    this.editorCurrentSettings = editorSettings;
-    const userData = await this.save();
-    return userData;
-  };
-
   class UserUpperLimitException {
   class UserUpperLimitException {
 
 
     constructor() {
     constructor() {

+ 5 - 6
packages/app/src/server/routes/apiv3/personal-setting.js

@@ -463,7 +463,7 @@ module.exports = (crowi) => {
    * @swagger
    * @swagger
    *
    *
    *    /personal-setting:
    *    /personal-setting:
-   *      get:
+   *      put:
    *        tags: [PersonalSetting]
    *        tags: [PersonalSetting]
    *        operationId: getPersonalSetting
    *        operationId: getPersonalSetting
    *        summary: /personal-setting
    *        summary: /personal-setting
@@ -479,16 +479,15 @@ module.exports = (crowi) => {
    *                      type: object
    *                      type: object
    *                      description: editor preferences
    *                      description: editor preferences
    */
    */
-  router.get('/editor-current-settings', accessTokenParser, loginRequiredStrictly, async(req, res) => {
-    const { body, user } = req;
-    const { editorSettings } = body;
+  router.put('/editor-current-settings', accessTokenParser, loginRequiredStrictly, async(req, res) => {
+    const { editorSettings } = req.body;
     try {
     try {
-      const userData = await user.updateEditorCurrentSettings(editorSettings);
+      const userData = await req.user.updateEditorCurrentSettings(editorSettings);
       return res.apiv3({ userData });
       return res.apiv3({ userData });
     }
     }
     catch (err) {
     catch (err) {
       logger.error(err);
       logger.error(err);
-      return res.apiv3Err('retrieving-update-personal-settings-failed');
+      return res.apiv3Err('updating-editor-settings-failed');
     }
     }
   });
   });