[Weberp-cvs] SF.net SVN: web-erp:[4195] trunk

[<tim...@us...>]

Revision: 4195
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4195&view=rev
Author:   tim_schofield
Date:     2010-12-22 14:18:29 +0000 (Wed, 22 Dec 2010)

Log Message:
-----------
$Message

Modified Paths:
--------------
    trunk/index.php
    trunk/sql/mysql/upgrade3.11.1-4.00.sql

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2010-12-22 14:18:14 UTC (rev 4194)
+++ trunk/index.php	2010-12-22 14:18:29 UTC (rev 4195)
@@ -22,14 +22,14 @@
 
 foreach ($_POST as $key => $value) {
 	if (substr($key, 0, 6)=='Update') {
-		$WidgetID=substr($key, 6, strlen($key)-6);
+		$ReportletID=substr($key, 6, strlen($key)-6);
 
-		$sql="UPDATE widgets SET refresh='".$_POST['RefreshRate'.$WidgetID]."' WHERE userid='".$_SESSION['UserID']."' AND id='".$WidgetID."'";
+		$sql="UPDATE reportlets SET refresh='".$_POST['RefreshRate'.$ReportletID]."' WHERE userid='".$_SESSION['UserID']."' AND id='".$ReportletID."'";
 		$result=DB_query($sql, $db);
 	}
 }
 
-$sql="SELECT * FROM widgets WHERE userid='".$_SESSION['UserID']."'";
+$sql="SELECT * FROM reportlets WHERE userid='".$_SESSION['UserID']."'";
 $result=DB_query($sql, $db);
 $j=1;
 
@@ -56,7 +56,7 @@
 	echo '</select>';
 	echo '<input type="submit" name="Update'.$myrow['id'].'" value="Go">';
 	echo '</th></tr>';
-	echo '<tr><td colspan=2><iframe frameborder="0" height="100%" width="100%" src="dashboard_widgets/WidgetContainer.php?Widget='.$myrow['id'].'&amp;Refresh='.$RefreshRate.'"></iframe>';
+	echo '<tr><td colspan=2><iframe frameborder="0" height="100%" width="100%" src="dashboard/ReportletContainer.php?Reportlet='.$myrow['id'].'&amp;Refresh='.$RefreshRate.'"></iframe>';
 	echo '</td></tr></table></form>';
 	if (($j % 2) == 0) echo '</tr><tr>';
 	$j++;

Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql	2010-12-22 14:18:14 UTC (rev 4194)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql	2010-12-22 14:18:29 UTC (rev 4195)
@@ -411,7 +411,7 @@
 
 ALTER TABLE `reports` ADD `col20width` INT( 3 ) NOT NULL DEFAULT '25' AFTER `col19width` ;
 
-ALTER TABLE `reportfields` CHANGE `fieldname` `fieldname` VARCHAR( 80) NOT NULL DEFAULT '';
+ALTER TABLE `reportfields` CHANGE `fieldname` `fieldname` VARCHAR( 80) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT '';
 
 ALTER TABLE `stockcatproperties` ADD `maximumvalue` DOUBLE NOT NULL DEFAULT 999999999 AFTER `defaultvalue` ,
 ADD `minimumvalue` DOUBLE NOT NULL DEFAULT -999999999,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.