Mercurial > gemma
changeset 400:cb233a5a2ecd
fix: Fixed country validation on submit
Fixed wrong validation behaviour.
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Tue, 14 Aug 2018 14:21:07 +0200 |
parents | 6c09aa214948 |
children | 746d8c9c35f4 |
files | client/src/components/Userdetail.vue client/src/views/Users.vue |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/Userdetail.vue Tue Aug 14 12:34:41 2018 +0200 +++ b/client/src/components/Userdetail.vue Tue Aug 14 14:21:07 2018 +0200 @@ -67,7 +67,7 @@ .userdetails { margin-top: $large-offset; - width: 53vw; + width: 48vw; margin-right: auto; height: 100%; } @@ -151,7 +151,7 @@ this.validateEmailaddress(); const valid = isEmailValid(this.currentUser.email) && - !this.currentUser.country && + this.currentUser.country && this.password === this.passwordre && (this.password === "" || violatedPasswordRules(this.password)); return valid;
--- a/client/src/views/Users.vue Tue Aug 14 12:34:41 2018 +0200 +++ b/client/src/views/Users.vue Tue Aug 14 14:21:07 2018 +0200 @@ -19,6 +19,7 @@ <th scope="col">Country</th> <th scope="col">Email</th> <th scope="col">Role</th> + <th scope="col"></th> </tr> </thead> <tbody> @@ -27,6 +28,7 @@ <td>{{ user.country }}</td> <td>{{ user.email}}</td> <td>{{ user.role }}</td> + <td><i @click="deleteUser(user.user)" class="fa fa-trash-o"></i></td> </tr> </tbody> </table> @@ -66,7 +68,7 @@ } .userlistsmall { - width: 30vw; + width: 35vw; } .userlistextended { @@ -117,6 +119,9 @@ } }, methods: { + deleteUser(name) { + console.log("delete: " + name); + }, addUser() { this.$store.commit("usermanagement/clearCurrentUser"); this.$store.commit("usermanagement/setUserDetailsVisible");