[evolvis-commits] r17281: [#1152] Merge r7147 and r7202 from messer-dev branch↵ and integrate

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Jun 7 10:24:03 CEST 2011


Author: mirabilos
Date: 2011-06-07 10:24:03 +0200 (Tue, 07 Jun 2011)
New Revision: 17281

Added:
   trunk/gforge_base/evolvisforge/gforge/db/20110607-std_search_filter_migrate.sql
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
   trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
Log:
[#1152] Merge r7147 and r7202 from messer-dev branch
and integrate


Added: trunk/gforge_base/evolvisforge/gforge/db/20110607-std_search_filter_migrate.sql
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/db/20110607-std_search_filter_migrate.sql	                        (rev 0)
+++ trunk/gforge_base/evolvisforge/gforge/db/20110607-std_search_filter_migrate.sql	2011-06-07 08:24:03 UTC (rev 17281)
@@ -0,0 +1,38 @@
+-- This file sets up the Standard Search Queries.
+-- NOTE: All Queries are register for the Nobody user. Every query that is registered with this user is
+--       a global search query.
+INSERT INTO artifact_query(group_artifact_id, user_id, query_name) VALUES ((SELECT min(group_artifact_id) FROM artifact_group_list WHERE name LIKE '%Bug%'), 100, 'Quality Assurance');
+
+-- Insert the fields for the just created query
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '2', 0, '1');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '1', 0, '0');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '3', 0, '');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '7', 0, '');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '8', 0, '');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '5', 0, 'artifact_id');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '6', 0, 'ASC');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '4', 9, '57,58,59,61');
+
+INSERT INTO artifact_query(group_artifact_id, user_id, query_name) VALUES ((SELECT min(group_artifact_id) FROM artifact_group_list WHERE name LIKE '%Bug%'), 100, 'Development');
+
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '2', 0, '1');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '1', 0, '0');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '3', 0, '');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '7', 0, '');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '8', 0, '');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '5', 0, 'artifact_id');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '6', 0, 'ASC');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '4', 9, '100,56');
+
+INSERT INTO artifact_query(group_artifact_id, user_id, query_name) VALUES ((SELECT min(group_artifact_id) FROM artifact_group_list WHERE name LIKE '%Bug%'), 100, 'Blocker/Critical');
+
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '2', 0, '1');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '1', 0, '0');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '3', 0, '');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '7', 0, '');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '8', 0, '');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '5', 0, 'artifact_id');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '6', 0, 'ASC');
+INSERT INTO artifact_query_fields VALUES ((SELECT max(artifact_query_id) FROM artifact_query), '4', 8, '49,50');
+
+-- Insert the Fields the standard searches search for.

Modified: trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl	2011-06-01 10:09:53 UTC (rev 17280)
+++ trunk/gforge_base/evolvisforge/gforge/deb-specific/db-upgrade.pl	2011-06-07 08:24:03 UTC (rev 17281)
@@ -3423,6 +3423,8 @@
 	$dbh->commit () ;
     }
 
+    &update_with_sql("20110607-std_search_filter_migrate.sql", "4.8.3+evolvis33.1");
+
     ########################### 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-01 10:09:53 UTC (rev 17280)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2011-06-07 08:24:03 UTC (rev 17281)
@@ -19,8 +19,12 @@
   * Fix Subject line encoding in SVN commit eMails
   * [TTID# 1112695] Allow uploading *.GraphML to MediaWiki
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 01 Jun 2011 12:08:06 +0200
+  [ 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 10:22:34 +0200
+
 gforge (4.8.3+evolvis33) unstable; urgency=high
 
   * Fix uninitialised variable warnings

Modified: trunk/gforge_base/evolvisforge/gforge/www/index_std.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/index_std.php	2011-06-01 10:09:53 UTC (rev 17280)
+++ trunk/gforge_base/evolvisforge/gforge/www/index_std.php	2011-06-07 08:24:03 UTC (rev 17281)
@@ -30,6 +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 _('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>

Modified: trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php	2011-06-01 10:09:53 UTC (rev 17280)
+++ trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php	2011-06-07 08:24:03 UTC (rev 17281)
@@ -320,7 +320,7 @@
 		<tr>';
 	echo '<td rowspan="2" class="hidePartForPrinting">';
 	$res=db_query("SELECT artifact_query_id,query_name 
-	FROM artifact_query WHERE user_id='".user_getid()."' AND group_artifact_id='".$ath->getID()."'");
+	FROM artifact_query WHERE (user_id='".user_getid()."' AND group_artifact_id='".$ath->getID()."') OR user_id=100");
 
 	if (db_numrows($res)>0) {
 		echo 



More information about the evolvis-commits mailing list