[evolvis-commits] r17288: [#1152] revert, for now

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Jun 7 15:38:39 CEST 2011


Author: mirabilos
Date: 2011-06-07 15:38:39 +0200 (Tue, 07 Jun 2011)
New Revision: 17288

Modified:
   trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/www/index_std.php
Log:
[#1152] revert, for now


Modified: trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl	2011-06-07 12:21:58 UTC (rev 17287)
+++ trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl	2011-06-07 13:38:39 UTC (rev 17288)
@@ -3425,6 +3425,36 @@
 
     &update_with_sql("20110607-std_search_filter_migrate", "4.8.3+evolvis33.1");
 
+    $version = &get_db_version;
+    $target = "4.8.3+evolvis33.2";
+    if (&is_lesser ($version, $target)) {
+	&debug ("Revert 20110607-std_search_filter_migrate");
+	@reqlist = (
+	    q{
+DELETE FROM artifact_query_fields
+WHERE artifact_query_id IN (
+	SELECT artifact_query_id FROM artifact_query
+	WHERE user_id=100
+    );
+},
+	    "DELETE FROM artifact_query
+		WHERE user_id=100;",
+	    );
+
+	foreach my $s (@reqlist) {
+	    $query = $s ;
+	    # debug $query ;
+	    $sth = $dbh->prepare ($query) ;
+	    $sth->execute () ;
+	    $sth->finish () ;
+	}
+	@reqlist = () ;
+
+	&update_db_version ($target) ;
+	&debug ("Committing.") ;
+	$dbh->commit () ;
+    }
+
     ########################### INSERT HERE #################################
 
     &debug ("It seems your database $action went well and smoothly. That's cool.") ;

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2011-06-07 12:21:58 UTC (rev 17287)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2011-06-07 13:38:39 UTC (rev 17288)
@@ -20,12 +20,13 @@
   * [TTID# 1112695] Allow uploading *.GraphML to MediaWiki
   * [TTID# 1112944] Rename “Data Type” translation[de] to “Tracker”
   * [#1689] Allow group admins to set wiki visibility
+  * Revert standard search queries (DB part) until they work
 
   [ Mike Esser ]
   * [#1152] Standard Search Queries for Trackers by mapping
     queries of user “nobody” into global queries
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 07 Jun 2011 14:21:48 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 07 Jun 2011 15:38:11 +0200
 
 gforge (4.8.3+evolvis33) unstable; urgency=high
 

Modified: trunk/gforge_base/evolvisforge/gforge/www/index_std.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/index_std.php	2011-06-07 12:21:58 UTC (rev 17287)
+++ trunk/gforge_base/evolvisforge/gforge/www/index_std.php	2011-06-07 13:38:39 UTC (rev 17288)
@@ -30,7 +30,7 @@
 </ul>
 <h3><?php print _("What's new in EvolvisForge 4.8"); ?></h3>
 <ul>
-<li><?php print _('Standard Search Queries for Trackers: global queries possible by assigning them to the nobody user.'); ?></li>
+<!-- li><?php print _('Standard Search Queries for Trackers: global queries possible by assigning them to the nobody user.'); ?></li -->
 <li><?php print _('Group (project) homepages are now held in a subdirectory of the main vhost by default, instead of a subdomain, for better SSL support.'); ?></li>
 <li><?php print _('Automatic commit mails for git and Subversion VCS repositories.'); ?></li>
 <li><?php print _('For Copy+Closed tasks, the “original” task is now moved and the “copied” replaces the old one. This keeps RSS subscriptions, permalinks and tarent-activity tracking sane.'); ?></li>



More information about the evolvis-commits mailing list