From 9fac11a5de647b51df871e040a581774012bf93a Mon Sep 17 00:00:00 2001 From: dongli Date: Thu, 1 Sep 2022 02:34:21 +0000 Subject: [PATCH 1/5] * Fix bug #26715. --- module/project/js/create.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/module/project/js/create.js b/module/project/js/create.js index 8ef3cc4a52..70ec96dd76 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -145,6 +145,18 @@ function setParentProgram(parentProgram) } budgetOverrunTips(); outOfDateTip(); + + $('#budgetUnit').val(data.budgetUnit).trigger("chosen:updated"); + if(typeof(data.availableBudget) == 'undefined') + { + $('#budget').removeAttr('placeholder').attr('disabled', 'disabled'); + $("#future").prop("checked", true); + } + else + { + $('#budget').removeAttr('disabled', 'disabled') + $("#future").prop("checked", false); + } }); $('#parent').attr('data-lastSelected', parentProgram); From c355db3d3d36f92db221786f418e6589fb38bcc0 Mon Sep 17 00:00:00 2001 From: dongli Date: Thu, 1 Sep 2022 02:49:49 +0000 Subject: [PATCH 2/5] * Fix bug #26715. --- module/project/js/create.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/module/project/js/create.js b/module/project/js/create.js index 70ec96dd76..1a4ce62599 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -145,17 +145,16 @@ function setParentProgram(parentProgram) } budgetOverrunTips(); outOfDateTip(); - - $('#budgetUnit').val(data.budgetUnit).trigger("chosen:updated"); + $('#budgetUnit').val(data.budgetUnit).trigger('chosen:updated'); if(typeof(data.availableBudget) == 'undefined') { $('#budget').removeAttr('placeholder').attr('disabled', 'disabled'); - $("#future").prop("checked", true); + $('#future').prop('checked', true); } else { $('#budget').removeAttr('disabled', 'disabled') - $("#future").prop("checked", false); + $('#future').prop('checked', false); } }); From a711704373eead43422d19158ae78b28966a93ec Mon Sep 17 00:00:00 2001 From: dongli Date: Thu, 1 Sep 2022 07:04:16 +0000 Subject: [PATCH 3/5] * Fix bug #26715. --- module/project/js/create.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/project/js/create.js b/module/project/js/create.js index 1a4ce62599..d6b73cab40 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -148,12 +148,12 @@ function setParentProgram(parentProgram) $('#budgetUnit').val(data.budgetUnit).trigger('chosen:updated'); if(typeof(data.availableBudget) == 'undefined') { - $('#budget').removeAttr('placeholder').attr('disabled', 'disabled'); + $('#budget').removeAttr('placeholder').attr('disabled', true); $('#future').prop('checked', true); } else { - $('#budget').removeAttr('disabled', 'disabled') + $('#budget').removeAttr('disabled', true) $('#future').prop('checked', false); } }); From c808b526818c2c06c89858b0cf38d42b8db27435 Mon Sep 17 00:00:00 2001 From: dongli Date: Thu, 1 Sep 2022 07:21:09 +0000 Subject: [PATCH 4/5] * Fix bug #26715. --- module/project/js/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/js/create.js b/module/project/js/create.js index d6b73cab40..9827c7423a 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -153,7 +153,7 @@ function setParentProgram(parentProgram) } else { - $('#budget').removeAttr('disabled', true) + $('#budget').removeAttr('disabled') $('#future').prop('checked', false); } }); From 51853ef5232ce69dfe5697ca511ab0a4822d16b4 Mon Sep 17 00:00:00 2001 From: dongli Date: Thu, 1 Sep 2022 07:42:29 +0000 Subject: [PATCH 5/5] * Fix bug #26188. --- module/my/css/changepassword.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/my/css/changepassword.css b/module/my/css/changepassword.css index 994521df07..85d0a993c3 100644 --- a/module/my/css/changepassword.css +++ b/module/my/css/changepassword.css @@ -1 +1,2 @@ #mainContent table > tbody > tr > td > div.text-danger.help-text {word-break: break-all;} +[lang^=fr] #mainContent table > tbody > tr {white-space: nowrap;}