[fusion-commits] r1895 - in trunk/widgets: FeatureInfo Query Theme

Wed Sep 9 03:30:07 EDT 2009

Author: christinebao
Date: 2009-09-09 03:30:04 -0400 (Wed, 09 Sep 2009)
New Revision: 1895

Modified:
   trunk/widgets/FeatureInfo/featureinfomain.php
   trunk/widgets/Query/querymain.php
   trunk/widgets/Theme/thememain.php
Log:
Refine error message in task panel for FeatureInfo, Query and Theme widgets.
Ticket http://trac.osgeo.org/fusion/ticket/282.

Modified: trunk/widgets/FeatureInfo/featureinfomain.php
===================================================================

--- trunk/widgets/FeatureInfo/featureinfomain.php	2009-09-02 13:31:23 UTC (rev 1894)
+++ trunk/widgets/FeatureInfo/featureinfomain.php	2009-09-09 07:30:04 UTC (rev 1895)
@@ -38,13 +38,10 @@
     {
         $errorMsg = $mge->GetMessage();
         $errorDetail = $mge->GetDetails();
-        echo $errorMsg;
-        echo $errorDetail;
     }
     catch (Exception $e)
     {
         $errorMsg = $e->GetMessage();
-        echo $errorMsg;
     }
 ?>
 <html>
@@ -283,6 +280,13 @@
     <tr><td id="totalArea"></td></tr>
 </table>
 
+<?php } else if ($errorDetail == null || (strlen($errorDetail) - strlen($errorMsg) < 5)) { ?>
+
+<table class="RegText" border="0" cellspacing="0" width="100%%">
+    <tr><td class="Title">Error<hr></td></tr>
+    <tr><td><?= $errorMsg ?></td></tr>
+</table>
+
 <?php } else { ?>
 
 <table class="RegText" border="0" cellspacing="0" width="100%%">

Modified: trunk/widgets/Query/querymain.php
===================================================================
--- trunk/widgets/Query/querymain.php	2009-09-02 13:31:23 UTC (rev 1894)
+++ trunk/widgets/Query/querymain.php	2009-09-09 07:30:04 UTC (rev 1895)
@@ -40,13 +40,10 @@
     {
         $errorMsg = $mge->GetMessage();
         $errorDetail = $mge->GetDetails();
-        echo $errorMsg;
-        echo $errorDetail;
     }
     catch (Exception $e)
     {
         $errorMsg = $e->GetMessage();
-        echo $errorMsg;
     }
 ?>
 <html>
@@ -464,6 +461,13 @@
 
 </table>
 
+<?php } else if ($errorDetail == null || (strlen($errorDetail) - strlen($errorMsg) < 5)) { ?>
+
+<table class="RegText" border="0" cellspacing="0" width="100%%">
+    <tr><td class="Title">Error<hr></td></tr>
+    <tr><td><?= $errorMsg ?></td></tr>
+</table>
+
 <?php } else { ?>
 
 <table class="RegText" border="0" cellspacing="0" width="100%%">

Modified: trunk/widgets/Theme/thememain.php
===================================================================
--- trunk/widgets/Theme/thememain.php	2009-09-02 13:31:23 UTC (rev 1894)
+++ trunk/widgets/Theme/thememain.php	2009-09-09 07:30:04 UTC (rev 1895)
@@ -443,6 +443,13 @@
     <tr><td colspan="2" align="right"><input class="Ctrl" type="button" value="Apply" style="width: 60px;" onClick="ApplyTheme()"></td></tr>
 </table>
 
+<?php } else if ($errorDetail == null || (strlen($errorDetail) - strlen($errorMsg) < 5)) { ?> 
+
+<table class="RegText" border="0" cellspacing="0" width="100%%">
+    <tr><td class="Title">Error<hr></td></tr>
+    <tr><td><?= $errorMsg ?></td></tr>
+</table>
+
 <?php } else { ?>
 
 <table class="RegText" border="0" cellspacing="0" width="100%%">

