summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/lib/external-backends/backendhelper.js2
-rw-r--r--webapp/src/components/AccountModule.vue15
-rw-r--r--webapp/src/components/UserCreateForm.vue18
3 files changed, 21 insertions, 14 deletions
diff --git a/server/lib/external-backends/backendhelper.js b/server/lib/external-backends/backendhelper.js
index 752ccf7..ae1af3d 100644
--- a/server/lib/external-backends/backendhelper.js
+++ b/server/lib/external-backends/backendhelper.js
@@ -32,7 +32,7 @@ module.exports = {
if (client.parents) {
var elements = backend.mappedGroups.filter(x => client.parents.includes(x.id))
if (elements.length > 1) {
- // TODO ADD MERGE CONFLICT
+ // Conflict occured!
const conflict = await db.conflict.create({ description: 'Multiple parents found' })
// Add backend to the conflict.
diff --git a/webapp/src/components/AccountModule.vue b/webapp/src/components/AccountModule.vue
index 9d22715..1e6511a 100644
--- a/webapp/src/components/AccountModule.vue
+++ b/webapp/src/components/AccountModule.vue
@@ -147,24 +147,27 @@
<v-text-field
type="password"
v-model="passwordCurrent"
- :label="$t('passwordCurrent')"
:rules="currentPasswordRules"
@input="clearCurrentPasswordErrors"
- ></v-text-field>
+ >
+ <template slot="label">{{ $t('passwordCurrent') }} <label class="error--text">*</label></template>
+ </v-text-field>
<v-text-field
validate-on-blur
type="password"
v-model="passwordNew"
- :label="$t('passwordNew')"
:rules="passwordRules"
- ></v-text-field>
+ >
+ <template slot="label">{{ $t('passwordNew') }} <label class="error--text">*</label></template>
+ </v-text-field>
<v-text-field
validate-on-blur
type="password"
v-model="passwordConfirm"
- :label="$t('passwordConfirm')"
:rules="confirmPasswordRules"
- ></v-text-field>
+ >
+ <template slot="label">{{ $t('passwordConfirm') }} <label class="error--text">*</label></template>
+ </v-text-field>
</v-form>
</div>
</div>
diff --git a/webapp/src/components/UserCreateForm.vue b/webapp/src/components/UserCreateForm.vue
index fc83227..8b31b95 100644
--- a/webapp/src/components/UserCreateForm.vue
+++ b/webapp/src/components/UserCreateForm.vue
@@ -33,29 +33,33 @@
<template>
<v-form class="signup-form" ref="form" v-model="valid">
- <v-text-field
+ <v-text-field class="required"
validate-on-blur
- :label="$t('username')"
v-model="user.username"
:rules="usernameRules"
autocomplete="off"
- ></v-text-field>
+ counter
+ >
+ <template slot="label">{{ $t('username') }} <label class="error--text">*</label></template>
+ </v-text-field>
<v-text-field
validate-on-blur
type="password"
- :label="$t('password')"
v-model="user.password"
:rules="passwordRules"
autocomplete="off"
- ></v-text-field>
+ >
+ <template slot="label">{{ $t('password') }} <label v-if="!id" class="error--text">*</label></template>
+ </v-text-field>
<v-text-field
validate-on-blur
type="password"
- :label="$t('confirmPassword')"
v-model="user.confirmPassword"
:rules="confirmPasswordRules"
autocomplete="off"
- ></v-text-field>
+ >
+ <template slot="label">{{ $t('confirmPassword') }} <label v-if="!id" class="error--text">*</label></template>
+ </v-text-field>
<v-text-field
:label="$t('name')"
autocomplete="off"