Skip to content

Commit 68d5efb

Browse files
author
gitlabci
committed
Merge branch '2024.11'
2 parents 5406bbb + 5ec84dd commit 68d5efb

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

tine20/Admin/js/user/EditDialog.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,7 @@ Tine.Admin.UserEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
958958

959959
this.mustChangeTriggerPlugin = new FieldTriggerPlugin({
960960
visible: false,
961+
doAssertState: false,
961962
triggerConfig: {tag: "div", cls: "x-form-trigger-flat x-form-trigger-plugin x-form-localized-field tinebase-trigger-overlay"},
962963
onTriggerClick: Ext.emptyFn,
963964
qtip: i18n._('Password is expired in accordance with the password policy and needs to be changed'),

tine20/Tinebase/js/ux/form/FieldTriggerPlugin.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class FieldTriggerPlugin {
1414
preserveElStyle = false
1515
hideOnEmptyValue = false
1616
hideOnInvalidValue = false
17+
doAssertState = true
1718
#trigger
1819

1920
constructor(config) {
@@ -69,6 +70,7 @@ class FieldTriggerPlugin {
6970
}
7071

7172
assertState() {
73+
if (!this.doAssertState) return
7274
this.#trigger?.setStyle({
7375
right: _.transform(this.field.plugins, (pos, plugin) => {
7476
if (plugin === this) return false

tine20/Tinebase/js/widgets/dialog/ResetPasswordDialog.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Tine.Tinebase.widgets.dialog.ResetPasswordDialog = Ext.extend(Tine.Tinebase.dial
4545

4646
this.mustChangeTriggerPlugin = new FieldTriggerPlugin({
4747
visible: false,
48+
doAssertState: false,
4849
triggerConfig: {tag: "div", cls: "x-form-trigger-flat x-form-trigger-plugin x-form-localized-field tinebase-trigger-overlay"},
4950
onTriggerClick: Ext.emptyFn,
5051
qtip: i18n._('Password is expired in accordance with the password policy and needs to be changed'),

0 commit comments

Comments
 (0)