Merge pull request #541 from Badsender-com/staging

Staging
Badsender-com · Nov 28, 2021 · ef3f017 · ef3f017
2 parents fe3ae95 + 7ee4e2d
commit ef3f017
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/server/group/group.schema.js b/packages/server/group/group.schema.js
@@ -29,7 +29,7 @@ const GroupSchema = Schema(
       // from mongoose doc:
       // violating the constraint returns an E11000 error from MongoDB when saving, not a Mongoose validation error.
       unique: true,
-      set: normalizeString,
+      set: trimString,
     },
     status: {
       type: String,

diff --git a/packages/server/template/template.schema.js b/packages/server/template/template.schema.js
@@ -5,7 +5,7 @@ const { Schema } = require('mongoose');
 const { ObjectId } = Schema.Types;
 const mongooseHidden = require('mongoose-hidden')();
 
-const { normalizeString } = require('../utils/model');
+const { trimString } = require('../utils/model');
 const { GroupModel } = require('../constant/model.names');
 
 /**
@@ -43,7 +43,7 @@ const TemplateSchema = Schema(
       type: String,
       unique: true,
       required: [true, 'name is required'],
-      set: normalizeString,
+      set: trimString,
     },
     description: {
       type: String,

diff --git a/packages/ui/components/group/form.vue b/packages/ui/components/group/form.vue
@@ -199,7 +199,7 @@ export default {
                   :label="$t('global.name')"
                   name="name"
                   required
-                  :disabled="disabled"
+                  :disabled="disabled || isGroupAdmin"
                   :error-messages="requiredErrors(`name`)"
                   @input="$v.group.name.$touch()"
                   @blur="$v.group.name.$touch()"