summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/UI/TClientScriptManager.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/HISTORY b/HISTORY
index 88bc8267..1017ec8d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -10,6 +10,7 @@ BUG: Issue #418 - Can't get parameters when friendly url enabled with UrlFormat=
ENH: Issue #419 - CssClass for PushButtons of TPager (ctrlaltca)
ENH: Issue #420 - Permit to easily mock TActiveRecordgateway for unit testing (mvschaik)
BUG: Issue #421 - TAutocomplete not rendering an empty suggestion list (Dario Rigolin)
+BUG: Issue #424 - TDefaultButton broken when multiple TDefaultButton are on the same page (ctrlaltca)
EHN: Permit to change the default cipher in TSecurityManager::setEncryption(); changed the default cipher from 3DES to AES256 (ctrlaltca)
EHN: Use php's hash_hmac() when available in TSecurityManager, and permit the use of all algorithms supported by php (ctrlaltca)
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index 3805c281..ce0d2e68 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -329,6 +329,7 @@ class TClientScriptManager extends TApplicationComponent
*/
protected function getDefaultButtonOptions($panelID, $buttonID)
{
+ $options['ID'] = TControl::convertUniqueIdToClientId($panelID);
$options['Panel'] = TControl::convertUniqueIdToClientId($panelID);
$options['Target'] = TControl::convertUniqueIdToClientId($buttonID);
$options['EventTarget'] = $buttonID;