Merge pull request #35253 from nextcloud/bugfix/noid/remove-warnings-loginpage

This commit is contained in:
Pytal 2022-11-18 10:27:12 -08:00 committed by GitHub
commit 4767551509
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 9 deletions

View file

@ -28,6 +28,7 @@ import Vue from 'vue'
import AppMenu from './AppMenu.vue'
export const setUp = () => {
Vue.mixin({
methods: {
t,
@ -35,8 +36,13 @@ export const setUp = () => {
},
})
const container = document.getElementById('header-left__appmenu')
if (!container) {
// no container, possibly we're on a public page
return
}
const AppMenuApp = Vue.extend(AppMenu)
const appMenu = new AppMenuApp({}).$mount('#header-left__appmenu')
const appMenu = new AppMenuApp({}).$mount(container)
Object.assign(OC, {
setNavigationCounter(id, counter) {

View file

@ -168,7 +168,7 @@ export default {
computed: {
isError() {
return this.invalidPassword || this.userDisabled
|| (this.throttleDelay && this.throttleDelay > 5000)
|| this.throttleDelay > 5000
},
errorLabel() {
if (this.invalidPassword) {
@ -177,7 +177,7 @@ export default {
if (this.userDisabled) {
return t('core', 'User disabled')
}
if (this.throttleDelay && this.throttleDelay > 5000) {
if (this.throttleDelay > 5000) {
return t('core', 'We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds.')
}
return undefined

4
dist/core-login.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

4
dist/core-main.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long