[Mapbender-commits] r4075 - in branches/2.6: http/php resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2009-06-22 14:39:42 -0400 (Mon, 22 Jun 2009)
New Revision: 4075

Modified:
   branches/2.6/http/php/mod_editElements.php
   branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql
Log:
http://trac.osgeo.org/mapbender/ticket/473#comment:1

Modified: branches/2.6/http/php/mod_editElements.php
===================================================================
--- branches/2.6/http/php/mod_editElements.php	2009-06-22 17:15:22 UTC (rev 4074)
+++ branches/2.6/http/php/mod_editElements.php	2009-06-22 18:39:42 UTC (rev 4075)
@@ -180,6 +180,8 @@
 		if($e_width < 1){$e_width = NULL;}
 		if($e_height < 1){$e_height = NULL;}
 		if($e_z_index < 1){$e_z_index = NULL;}
+		if($e_pos == ''){$e_pos = 2;}
+		if($e_public == ''){$e_public = 1;}		
 		
 		$sql = "INSERT INTO gui_element(fkey_gui_id,e_id,e_pos,e_public,e_comment,e_element,e_src,";
 		$sql .= "e_attributes,e_left,e_top,e_width,e_height,e_z_index,e_more_styles,e_content,";

Modified: branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql
===================================================================
--- branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql	2009-06-22 17:15:22 UTC (rev 4074)
+++ branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql	2009-06-22 18:39:42 UTC (rev 4075)
@@ -116,3 +116,9 @@
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
 
+
+ALTER TABLE gui_element ALTER COLUMN e_pos SET DEFAULT 2;
+ALTER TABLE gui_element ALTER COLUMN e_pos SET NOT NULL;
+
+ALTER TABLE gui_element ALTER COLUMN e_public SET DEFAULT 1;
+ALTER TABLE gui_element ALTER COLUMN e_public SET NOT NULL;