[Evolvis-commits] r169: experimentally fix the maven user for newly created groups↵ SQL mostly by cpreil , 10x↵

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Sep 28 15:48:39 CEST 2009


Author: mirabilos
Date: 2009-09-28 13:48:38 +0000 (Mon, 28 Sep 2009)
New Revision: 169

Modified:
   trunk/gforge_base/gforge-4.8/common/include/system/pgsql.class.php
   trunk/gforge_base/gforge-4.8/debian/changelog
Log:
experimentally fix the maven user for newly created groups
SQL mostly by cpreil, 10x


Modified: trunk/gforge_base/gforge-4.8/common/include/system/pgsql.class.php
===================================================================
--- trunk/gforge_base/gforge-4.8/common/include/system/pgsql.class.php	2009-09-28 12:04:03 UTC (rev 168)
+++ trunk/gforge_base/gforge-4.8/common/include/system/pgsql.class.php	2009-09-28 13:48:38 UTC (rev 169)
@@ -351,48 +351,43 @@
 				}
 
 				/*
-				 * Add user "maven" to all groups
-				 * -- tg at aurisp.de
+				 * Add user "maven" to all groups, as
+				 * well as all SCM groups, to make it
+				 * possible for Continuum to checkout
+				 * any source from any project.
 				 */
 
-				$query="INSERT INTO nss_usergroups (
-					SELECT
-						200 AS uid,
-						groups.group_id + ".$this->GID_ADD." AS gid,
-						0 AS user_id,
-						groups.group_id AS group_id,
-						'maven' AS user_name,
-						groups.unix_group_name AS unix_group_name
-					FROM groups
-					WHERE group_id=$group_id
-					);";
-				$res5=db_query($query);
+				$res5 = db_query_params("INSERT INTO nss_usergroups
+					SELECT DISTINCT u.user_id+20000,
+					    g.group_id+10000, u.user_id,
+					    g.group_id, u.user_name,
+					    g.unix_group_name
+					FROM users u, groups g
+					WHERE u.user_name=$1 AND
+					    g.group_id=$2",
+				    array('maven', $group_id));
+
 	                	if (!$res5) {
-	                        	$this->setError('ERROR - Could Not Insert Maven: '.db_error());
+	                        	$this->setError('ERROR - Could Not Insert Maven (GID): '.db_error());
 	                        	return false;
 				}
-				
-				/*
-				 * Add user "maven to scm" to all groups
-				 * -- tg at aurisp.de
-				 */
 
-				$res5a = db_query_params("INSERT INTO nss_usergroups (
-					SELECT
-						200 AS uid,
-						groups.group_id + $1 AS gid,
-						0 AS user_id,
-						groups.group_id AS group_id,
-						'maven' AS user_name,
-						groups.unix_group_name AS unix_group_name
-					FROM groups
-					WHERE group_id=$2
-					);", array($this->SCM_UID_ADD, $group_id));
-	                	if (!$res5a) {
-	                        	$this->setError('ERROR - Could Not Insert Maven for SVM Group: '.db_error());
+				$res5 = db_query_params("INSERT INTO nss_usergroups
+					SELECT DISTINCT u.user_id+20000,
+					    g.group_id+50000, u.user_id,
+					    g.group_id, u.user_name,
+					    g.unix_group_name
+					FROM users u, groups g
+					WHERE u.user_name=$1 AND
+					    g.group_id=$2",
+				    array('maven', $group_id));
+
+	                	if (!$res5) {
+	                        	$this->setError('ERROR - Could Not Insert Maven (SCM): '.db_error());
 	                        	return false;
 				}
 
+
 				$res6 = db_query_params ('INSERT INTO nss_usergroups (
 					SELECT
 						users.unix_uid AS uid,

Modified: trunk/gforge_base/gforge-4.8/debian/changelog
===================================================================
--- trunk/gforge_base/gforge-4.8/debian/changelog	2009-09-28 12:04:03 UTC (rev 168)
+++ trunk/gforge_base/gforge-4.8/debian/changelog	2009-09-28 13:48:38 UTC (rev 169)
@@ -14,8 +14,9 @@
   * www/themes/evolvis: add links to “info.evolvis.org” (XXX needs to be
     made dynamic) and the Wiki (XXX hard-codes wiki basepath, too)
   * Fix encoding of eMail Subject headers (prefer QP)
+  * Fix adding the maven user to all projects
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 28 Sep 2009 14:03:09 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Mon, 28 Sep 2009 15:48:06 +0200
 
 gforge (4.8-3) unstable; urgency=low
 




More information about the evolvis-commits mailing list