Commit 18c9fe29 authored by Agate's avatar Agate 💬

Merge branch '407-confirm' into 'develop'

Resolve "Automatically confirm email once the confirmation link is clicked instead of showing the form"

Closes #407

See merge request funkwhale/funkwhale!1160
parents 8b0ce6ad 926e6955
Confirm email without requiring the user to validate the form manually (#407)
\ No newline at end of file
...@@ -89,7 +89,6 @@ ...@@ -89,7 +89,6 @@
<tr <tr
:id="'queue-item-' + index" :id="'queue-item-' + index"
role="button" role="button"
tabindex="0"
v-if="track.sources.length > 0" v-if="track.sources.length > 0"
:key="index" :key="index"
:class="[{active: index === currentIndex}]" :class="[{active: index === currentIndex}]"
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<translate translate-context="*/Login/*/Verb">Reset your password</translate> <translate translate-context="*/Login/*/Verb">Reset your password</translate>
</router-link> </router-link>
</label> </label>
<password-input :index="2" required v-model="credentials.password" /> <password-input required v-model="credentials.password" />
</div> </div>
</template> </template>
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<input <input
required required
name="password" name="password"
:tabindex="index"
:type="passwordInputType" :type="passwordInputType"
@input="$emit('input', $event.target.value)" @input="$emit('input', $event.target.value)"
:value="value"> :value="value">
...@@ -30,7 +29,7 @@ function copyStringToClipboard (str) { ...@@ -30,7 +29,7 @@ function copyStringToClipboard (str) {
} }
export default { export default {
props: ['value', 'index', 'defaultShow', 'copyButton'], props: ['value', 'defaultShow', 'copyButton'],
data () { data () {
return { return {
showPassword: this.defaultShow || false, showPassword: this.defaultShow || false,
......
...@@ -52,6 +52,11 @@ export default { ...@@ -52,6 +52,11 @@ export default {
} }
} }
}, },
mounted () {
if (this.key) {
this.submit()
}
},
methods: { methods: {
submit() { submit() {
let self = this let self = this
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment