From 348a4558c1adb96b961a08d8bce0d196125ccbac Mon Sep 17 00:00:00 2001 From: David Date: Wed, 18 Feb 2015 18:04:24 +0100 Subject: Fix #546 Added TAccordion specific exception messages --- framework/Exceptions/messages/messages.txt | 6 +++++- framework/Web/UI/WebControls/TAccordion.php | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/framework/Exceptions/messages/messages.txt b/framework/Exceptions/messages/messages.txt index 8ea41292..600cd1f5 100644 --- a/framework/Exceptions/messages/messages.txt +++ b/framework/Exceptions/messages/messages.txt @@ -505,4 +505,8 @@ tactivetablerow_control_notincollection = {0} '{1}' no member of the TTableRowCo juioptions_control_invalid = Control '{0}' must implement IJuiOptions. juioptions_option_invalid = '{1}' is not a valid option for control '{0}'. -ratinglist_invalid_caption_id = '{0}' is not a valid caption control for TRatingList '{0}'. \ No newline at end of file +ratinglist_invalid_caption_id = '{0}' is not a valid caption control for TRatingList '{0}'. + +accordion_activeviewid_invalid = TAccordion.ActiveViewID has an invalid ID '{0}'. +accordion_activeviewindex_invalid = TAccordion.ActiveViewIndex has an invalid Index '{0}'. +accordion_view_inexistent = TAccordion cannot find the specified view. \ No newline at end of file diff --git a/framework/Web/UI/WebControls/TAccordion.php b/framework/Web/UI/WebControls/TAccordion.php index fc794cd4..1e9fcd43 100644 --- a/framework/Web/UI/WebControls/TAccordion.php +++ b/framework/Web/UI/WebControls/TAccordion.php @@ -142,14 +142,14 @@ class TAccordion extends TWebControl implements IPostBackDataHandler if(($index=$views->findIndexByID($id))>=0) $activeView=$views->itemAt($index); else - throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id); + throw new TInvalidDataValueException('accordion_activeviewid_invalid',$id); } else if(($index=$this->getActiveViewIndex())>=0) { if($index<$views->getCount()) $activeView=$views->itemAt($index); else - throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index); + throw new TInvalidDataValueException('accordion_activeviewindex_invalid',$index); } else { @@ -176,7 +176,7 @@ class TAccordion extends TWebControl implements IPostBackDataHandler if($this->getViews()->indexOf($view)>=0) $this->activateView($view); else - throw new TInvalidOperationException('tabpanel_view_inexistent'); + throw new TInvalidOperationException('accordion_view_inexistent'); } /** -- cgit v1.2.3