[phpBT-dev] CVS: phpbt index.php,1.41,1.42 query.php,1.106,1.107

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28854

Modified Files:
	index.php query.php 
Log Message:
Fix for edit advanced queries


Index: index.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/index.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- index.php	19 Jul 2005 19:25:36 -0000	1.41
+++ index.php	2 Oct 2005 20:44:19 -0000	1.42
@@ -142,7 +142,7 @@
 	foreach ($aProjects['projects'] as $iProjectNumberKey => $value1) {
 		foreach ($aProjects['projects'][$iProjectNumberKey] as $sResolutionKey => $value2) {
 			if ($sResolutionKey != "Project" && $sResolutionKey != "Total" && $sResolutionKey != "Open") {
-				$aProjects['projects'][$iProjectNumberKey][$sResolutionKey] = "<A HREF='query.php?resolution%5B%5D=" . $aResolutionsToIds[$sResolutionKey] . "&projects=" . $aProjectsToIds[$aProjects['projects'][$iProjectNumberKey]["Project"]] . "&op=doquery'>" . $aProjects['projects'][$iProjectNumberKey][$sResolutionKey] . "</A>";
+				$aProjects['projects'][$iProjectNumberKey][$sResolutionKey] = "<A HREF='query.php?resolution%5B%5D=" . $aResolutionsToIds[$sResolutionKey] . "&projects=" . $aProjectsToIds[$aProjects['projects'][$iProjectNumberKey]["Project"]] . "&op=doquery&form=advanced'>" . $aProjects['projects'][$iProjectNumberKey][$sResolutionKey] . "</A>";
 			} elseif ($sResolutionKey == "Open") {
 				$aProjects['projects'][$iProjectNumberKey][$sResolutionKey] = "<A HREF='query.php?projects=" . $aProjectsToIds[$aProjects['projects'][$iProjectNumberKey]["Project"]] . $sOpenStatusQuery . "&op=doquery'>" . $aProjects['projects'][$iProjectNumberKey][$sResolutionKey] . "</A>";
 			} elseif ($sResolutionKey == "Total") {

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- query.php	27 Sep 2005 19:49:42 -0000	1.106
+++ query.php	2 Oct 2005 20:44:19 -0000	1.107
@@ -81,7 +81,8 @@
 	}
 
 	// Show the advanced query form
-	if (!empty($_GET['form']) and $_GET['form'] == 'advanced') {
+	if (!empty($_GET['form']) and $_GET['form'] == 'advanced' or
+		!empty($form) and $form == 'advanced') {
 		$t->render('queryform.html', translate("Query Bugs"));
 	} else { // or show the simple one
 		$t->render('queryform-simple.html', translate("Query Bugs"));