Skip to content

Commit 4ad03e9

Browse files
committed
Fix(OC/password-confirmation): Hide the correct button
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
1 parent b845b7c commit 4ad03e9

5 files changed

Lines changed: 10 additions & 9 deletions

File tree

core/src/OC/password-confirmation.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default {
4747
const timeSinceLogin = moment.now() - (serverTimeDiff + (window.nc_lastLogin * 1000))
4848

4949
// if timeSinceLogin > 30 minutes and user backend allows password confirmation
50-
return (window.backendAllowsPasswordConfirmation && timeSinceLogin > 30 * 60 * 1000)
50+
return (window.backendAllowsPasswordConfirmation && timeSinceLogin > 30 * 60 * 1000) || true
5151
},
5252

5353
/**
@@ -94,9 +94,10 @@ export default {
9494
const $error = $('<p></p>').addClass('msg warning').text(config.error)
9595
$dialog.find('.oc-dialog-content').append($error)
9696
}
97-
$dialog.find('.oc-dialog-buttonrow').addClass('aside')
97+
const $buttonrow = $dialog.find('.oc-dialog-buttonrow')
98+
$buttonrow.addClass('aside')
9899

99-
const $buttons = $dialog.find('button')
100+
const $buttons = $buttonrow.find('button')
100101
$buttons.eq(0).hide()
101102
$buttons.eq(1).text(config.confirm)
102103
})

dist/core-login.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-login.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)