[geeklog-cvs] geeklog: Fixed Calendar upgrade problems dealing with adding con...

[geeklog-cvs at lists.geeklog.net]

changeset 8531:20c144c4aeaf
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/20c144c4aeaf
user: Tom <websitemaster at cogeco.net>
date: Tue Mar 13 09:19:28 2012 -0400
description:
Fixed Calendar upgrade problems dealing with adding configuration options and security for the tabs.

diffstat:

 plugins/calendar/functions.inc         |  13 +++++++++----
 plugins/calendar/sql/mssql_updates.php |   2 --
 plugins/calendar/sql/mysql_updates.php |   2 --
 plugins/calendar/sql/pgsql_updates.php |   2 --
 4 files changed, 9 insertions(+), 10 deletions(-)

diffs (69 lines):

diff -r 99c90e9d36a0 -r 20c144c4aeaf plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Wed Mar 07 12:33:17 2012 -0500
+++ b/plugins/calendar/functions.inc	Tue Mar 13 09:19:28 2012 -0400
@@ -1587,10 +1587,15 @@
             }
 
             if (! $current_config) {
+                // Update to Config Tables must be performed here and not in regualar SQL update array since if config is current then they shouldn't be run   
+                // Set new Tab column to whatever fieldset is
+                $sql = "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'calendar'";
+                DB_query($sql);
+                
                 calendar_update_ConfValues_1_1_1();
-
-                calendar_update_ConfigSecurity_1_1_1();
             }
+            
+            calendar_update_ConfigSecurity_1_1_1();
 
             $current_version = '1.1.2';
             break;
@@ -1605,9 +1610,9 @@
 
             if (! $current_config) {
                 calendar_update_ConfValues_1_1_2();
+            }
 
-                calendar_update_ConfigSecurity_1_1_2();
-            }
+            calendar_update_ConfigSecurity_1_1_2();
 
             $current_version = '1.1.3';
             break;            
diff -r 99c90e9d36a0 -r 20c144c4aeaf plugins/calendar/sql/mssql_updates.php
--- a/plugins/calendar/sql/mssql_updates.php	Wed Mar 07 12:33:17 2012 -0500
+++ b/plugins/calendar/sql/mssql_updates.php	Tue Mar 13 09:19:28 2012 -0400
@@ -45,8 +45,6 @@
     ),
 
     '1.1.1' => array(
-        // Set new Tab column to whatever fieldset is
-        "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'calendar'",   
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_main', 'Access to configure general calendar settings', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_permissions', 'Access to configure event default permissions', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_autotag_permissions', 'Access to configure event autotag usage permissions', 0)"        
diff -r 99c90e9d36a0 -r 20c144c4aeaf plugins/calendar/sql/mysql_updates.php
--- a/plugins/calendar/sql/mysql_updates.php	Wed Mar 07 12:33:17 2012 -0500
+++ b/plugins/calendar/sql/mysql_updates.php	Tue Mar 13 09:19:28 2012 -0400
@@ -45,8 +45,6 @@
     ),
 
     '1.1.1' => array(
-        // Set new Tab column to whatever fieldset is
-        "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'calendar'", 
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_main', 'Access to configure general calendar settings', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_permissions', 'Access to configure event default permissions', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_autotag_permissions', 'Access to configure event autotag usage permissions', 0)"        
diff -r 99c90e9d36a0 -r 20c144c4aeaf plugins/calendar/sql/pgsql_updates.php
--- a/plugins/calendar/sql/pgsql_updates.php	Wed Mar 07 12:33:17 2012 -0500
+++ b/plugins/calendar/sql/pgsql_updates.php	Tue Mar 13 09:19:28 2012 -0400
@@ -35,8 +35,6 @@
 $_UPDATES = array(
 
     '1.1.1' => array(
-        // Set new Tab column to whatever fieldset is
-        "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'calendar'",   
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_main', 'Access to configure general calendar settings', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_permissions', 'Access to configure event default permissions', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_autotag_permissions', 'Access to configure event autotag usage permissions', 0)"