Merge pull request #63 from ciatph/dev

v1.1.3

Author: ciatph

.gitignore

@@ -1,2 +1,3 @@
 .env
 .vscode
+*.zip

client/src/components/common/userform/index.js

@@ -54,6 +54,7 @@ function UserForm (props) {
       <TextField
         id='password'
         label='Enter password'
+        placeholder={type === 'create' ? 'Enter password' : 'Password will not be updated if left blank' }
         variant='outlined'
         size='small'
         disabled={loadstatus.isLoading}

client/src/utils/service/service.js

@@ -71,8 +71,8 @@ export default class Service {
     const body = {}
 
     fields.forEach((item) => {
-      if (info[item.toLowerCase()] !== undefined && info[item.toLowerCase()] !== '') {
-        body[item] = info[item.toLowerCase()]
+      if (info[item.toLowerCase()] !== undefined && (item !== 'password') ? info[item] !== '' : true) {
+        body[item] = info[item]
       } else {
         throw new Error('Please check your input.')
       }