[geeklog-hg] geeklog: Removed duplicate code for upgrading Staticpages plugin

[geeklog-cvs at lists.geeklog.net]

changeset 9511:6a020a14bb25
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/6a020a14bb25
user: Kenji ITO <mystralkk at gmail.com>
date: Fri Mar 07 08:47:14 2014 +0900
description:
Removed duplicate code for upgrading Staticpages plugin

diffstat:

 sql/updates/mssql_2.0.0_to_2.1.0.php |  11 -----------
 sql/updates/mysql_2.0.0_to_2.1.0.php |  11 -----------
 sql/updates/pgsql_2.0.0_to_2.1.0.php |  11 -----------
 3 files changed, 0 insertions(+), 33 deletions(-)

diffs (84 lines):

diff -r bc8d6c6257da -r 6a020a14bb25 sql/updates/mssql_2.0.0_to_2.1.0.php
--- a/sql/updates/mssql_2.0.0_to_2.1.0.php	Fri Mar 07 08:46:27 2014 +0900
+++ b/sql/updates/mssql_2.0.0_to_2.1.0.php	Fri Mar 07 08:47:14 2014 +0900
@@ -46,12 +46,6 @@
     $configAdminId = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Configuration Admin' ");
     $storyAdminId = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Story Admin' ");
 
-    if (DB_count($_TABLES['groups'], 'grp_name', 'Static Page Admin') == 1) {
-        $staticPageAdminId = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Static Page Admin' ");
-    } else {
-        $staticPageAdminId = NULL;
-    }
-
     // Add Filemanager Admin group
     DB_query("INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (null, 'Filemanager Admin', 'Has full access to File Manager', 1);");
     $groupId = DB_insertId();
@@ -75,11 +69,6 @@
     // Add access rights
     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['filemanager.admin']}, {$groupId}) ");
     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['filemanager.admin']}, {$storyAdminId}) ");
-
-    if ($staticPageAdminId !== NULL) {
-        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['filemanager.admin']}, {$staticPageAdminId}) ");
-    }
-
     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['config.Filemanager.tab_general']}, {$configAdminId}) ");
 	DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['config.Filemanager.tab_upload']}, {$configAdminId}) ");
 	DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['config.Filemanager.tab_images']}, {$configAdminId}) ");
diff -r bc8d6c6257da -r 6a020a14bb25 sql/updates/mysql_2.0.0_to_2.1.0.php
--- a/sql/updates/mysql_2.0.0_to_2.1.0.php	Fri Mar 07 08:46:27 2014 +0900
+++ b/sql/updates/mysql_2.0.0_to_2.1.0.php	Fri Mar 07 08:47:14 2014 +0900
@@ -46,12 +46,6 @@
     $configAdminId = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Configuration Admin' ");
     $storyAdminId = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Story Admin' ");
 
-    if (DB_count($_TABLES['groups'], 'grp_name', 'Static Page Admin') == 1) {
-        $staticPageAdminId = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Static Page Admin' ");
-    } else {
-        $staticPageAdminId = NULL;
-    }
-
     // Add Filemanager Admin group
     DB_query("INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (null, 'Filemanager Admin', 'Has full access to File Manager', 1);");
     $groupId = DB_insertId();
@@ -75,11 +69,6 @@
     // Add access rights
     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['filemanager.admin']}, {$groupId}) ");
     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['filemanager.admin']}, {$storyAdminId}) ");
-
-    if ($staticPageAdminId !== NULL) {
-        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['filemanager.admin']}, {$staticPageAdminId}) ");
-    }
-
     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['config.Filemanager.tab_general']}, {$configAdminId}) ");
 	DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['config.Filemanager.tab_upload']}, {$configAdminId}) ");
 	DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['config.Filemanager.tab_images']}, {$configAdminId}) ");
diff -r bc8d6c6257da -r 6a020a14bb25 sql/updates/pgsql_2.0.0_to_2.1.0.php
--- a/sql/updates/pgsql_2.0.0_to_2.1.0.php	Fri Mar 07 08:46:27 2014 +0900
+++ b/sql/updates/pgsql_2.0.0_to_2.1.0.php	Fri Mar 07 08:47:14 2014 +0900
@@ -46,12 +46,6 @@
     $configAdminId = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Configuration Admin' ");
     $storyAdminId = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Story Admin' ");
 
-    if (DB_count($_TABLES['groups'], 'grp_name', 'Static Page Admin') == 1) {
-        $staticPageAdminId = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name = 'Static Page Admin' ");
-    } else {
-        $staticPageAdminId = NULL;
-    }
-
     // Add Filemanager Admin group
     DB_query("INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (null, 'Filemanager Admin', 'Has full access to File Manager', 1);");
     $groupId = DB_insertId();
@@ -75,11 +69,6 @@
     // Add access rights
     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['filemanager.admin']}, {$groupId}) ");
     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['filemanager.admin']}, {$storyAdminId}) ");
-
-    if ($staticPageAdminId !== NULL) {
-        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['filemanager.admin']}, {$staticPageAdminId}) ");
-    }
-
     DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['config.Filemanager.tab_general']}, {$configAdminId}) ");
 	DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['config.Filemanager.tab_upload']}, {$configAdminId}) ");
 	DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ({$featureIds['config.Filemanager.tab_images']}, {$configAdminId}) ");