[evolvis-commits] r17479: [TTID# 1116517] Ensure groups.scm_box is always empty↵ (part of the fix)

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Aug 16 14:50:55 CEST 2011


Author: mirabilos
Date: 2011-08-16 14:50:55 +0200 (Tue, 16 Aug 2011)
New Revision: 17479

Modified:
   trunk/gforge_base/evolvisforge/gforge/common/include/Group.class.php
   trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/setup
Log:
[TTID# 1116517] Ensure groups.scm_box is always empty
(part of the fix)


Modified: trunk/gforge_base/evolvisforge/gforge/common/include/Group.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/Group.class.php	2011-08-15 13:24:46 UTC (rev 17478)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/Group.class.php	2011-08-16 12:50:55 UTC (rev 17479)
@@ -342,7 +342,7 @@
 						       util_make_url('/www/' . $unix_name . '/'),
 						       'P',
 						       $unix_box,
-						       $scm_box,
+						       '',
 						       $purpose_e,
 						       time(),
 						       $is_public,
@@ -936,7 +936,8 @@
 	 * @param	string The name of the new SCM_BOX
 	 */
 	function setSCMBox($scm_box) {
-		if ($scm_box) {
+		return false;
+		/* not at the moment: */
 			db_begin();
 			$res = db_query_params ('UPDATE groups SET scm_box=$1 WHERE group_id=$2', array ($scm_box, $this->getID ()));
 			if ($res) {
@@ -949,10 +950,6 @@
 				$this->setError(_("Couldn't insert SCM_BOX to database"));
 				return false;
 			}
-		} else {
-			$this->setError(_("SCM Box can't be empty"));
-			return false;
-		}
 	}
 
 	/**

Modified: trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl	2011-08-15 13:24:46 UTC (rev 17478)
+++ trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl	2011-08-16 12:50:55 UTC (rev 17479)
@@ -3457,9 +3457,9 @@
     &update_with_sql("20110808-scm_subrepos","4.8.3+evolvis35+1");
 
     $version = &get_db_version;
-    $target = "4.8.3+evolvis35+2";
+    $target = "4.8.3+evolvis36";
     if (&is_lesser ($version, $target)) {
-	&debug("Update project_counts_agg table");
+	&debug("Update project_counts_agg table and drop scm_box variations");
 	@reqlist = (
 	    "DELETE FROM project_counts_agg;",
 	    "INSERT INTO project_counts_agg
@@ -3473,6 +3473,7 @@
 			    AND status_id IN (1,4,5,6)
 		    )
 		FROM project_group_list;",
+	    "UPDATE groups SET scm_box='';",
 	    );
 
 	foreach my $s (@reqlist) {

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2011-08-15 13:24:46 UTC (rev 17478)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2011-08-16 12:50:55 UTC (rev 17479)
@@ -1,6 +1,5 @@
-gforge (4.8.3+evolvis36) xunstable; urgency=low
+gforge (4.8.3+evolvis36) unstable; urgency=low
 
-  [ Thorsten Glaser ]
   * Evolvis theme: display Wiki link in Public Areas
   * Drop SOAP API for calls that have no backend any more
     (noticed by Patrick Apel, thanks!)
@@ -8,8 +7,12 @@
   * Allow git subrepo creation as SCM admin via WUI
   * [#1874] Fix DatePicker in global search
   * Update open/total task counts on upgrade
+  * [TTID# 1116517] Ensure groups.scm_box is always empty (we
+    currently display $sys_scm_host but FF5.1 does so only if
+    the DB field is empty), clear it and do not allow setting
+    it again in the current codebase
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 09 Aug 2011 11:25:15 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 16 Aug 2011 14:49:13 +0200
 
 gforge (4.8.3+evolvis35) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge/gforge/setup
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/setup	2011-08-15 13:24:46 UTC (rev 17478)
+++ trunk/gforge_base/evolvisforge/gforge/setup	2011-08-16 12:50:55 UTC (rev 17479)
@@ -31,7 +31,7 @@
 	DEFAULTip_address=`hostname_oneword -i`
 	# for apache vhosts
 	DEFAULTip_web='*'
-	DEFAULTscm_host=scm.$DEFAULTdomain_name
+	DEFAULTscm_host=$DEFAULTdomain_name
 	DEFAULTshell_host=shell.$DEFAULTdomain_name
 	DEFAULTusers_host=users.$DEFAULTdomain_name
 	DEFAULTlists_host=lists.$DEFAULTdomain_name



More information about the evolvis-commits mailing list