Commit 42355da7aa3fdfb94c0da43196c93fd0b2550806
1 parent
ba70e17a
Handle multiple error messages, as well as errors via $_SESSION
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3330 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
9 additions
and
4 deletions
lib/visualpatterns/PatternMainPage.inc
| @@ -57,7 +57,7 @@ class PatternMainPage { | @@ -57,7 +57,7 @@ class PatternMainPage { | ||
| 57 | /** whether the form has fields that require javascript checking */ | 57 | /** whether the form has fields that require javascript checking */ |
| 58 | var $bHasRequiredFields = false; | 58 | var $bHasRequiredFields = false; |
| 59 | /** default page error message */ | 59 | /** default page error message */ |
| 60 | - var $sErrorMessage; | 60 | + var $sErrorMessage = array(); |
| 61 | 61 | ||
| 62 | var $sHelpContext = "browse"; | 62 | var $sHelpContext = "browse"; |
| 63 | /** javascript to execute on body load **/ | 63 | /** javascript to execute on body load **/ |
| @@ -115,7 +115,7 @@ class PatternMainPage { | @@ -115,7 +115,7 @@ class PatternMainPage { | ||
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | function setErrorMessage($sNewValue) { | 117 | function setErrorMessage($sNewValue) { |
| 118 | - $this->sErrorMessage = $sNewValue; | 118 | + $this->sErrorMessage[] = $sNewValue; |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | function setFormEncType($sNewValue) { | 121 | function setFormEncType($sNewValue) { |
| @@ -203,9 +203,14 @@ class PatternMainPage { | @@ -203,9 +203,14 @@ class PatternMainPage { | ||
| 203 | $sToRender .= "\t<div id=\"divScrollTextCont\">\n | 203 | $sToRender .= "\t<div id=\"divScrollTextCont\">\n |
| 204 | \t\t<div id=\"divText\">\n"; | 204 | \t\t<div id=\"divText\">\n"; |
| 205 | } | 205 | } |
| 206 | - if (isset($this->sErrorMessage)) { | ||
| 207 | - $sToRender .= "<table border=\"0\"><tr><td><p class=\"errorText\">$this->sErrorMessage</p></td></tr></table>\n "; | 206 | + foreach ($this->sErrorMessage as $sErrorMessage) { |
| 207 | + $sToRender .= "<table border=\"0\"><tr><td><p class=\"errorText\">$sErrorMessage</p></td></tr></table>\n "; | ||
| 208 | } | 208 | } |
| 209 | + if ($_SESSION['errorMessage']) { | ||
| 210 | + $sErrorMessage = $_SESSION['errorMessage']; | ||
| 211 | + $sToRender .= "<table border=\"0\"><tr><td><p class=\"errorText\">$sErrorMessage</p></td></tr></table>\n "; | ||
| 212 | + unset($_SESSION['errorMessage']); | ||
| 213 | + } | ||
| 209 | $sToRender = $sToRender . "\n" . $this->oCentralPayload->render() . "\n"; | 214 | $sToRender = $sToRender . "\n" . $this->oCentralPayload->render() . "\n"; |
| 210 | } else { | 215 | } else { |
| 211 | $sToRender = $sToRender . "\nCentral payload not set\n"; | 216 | $sToRender = $sToRender . "\nCentral payload not set\n"; |