[phpBT-dev] CVS: phpbt bug.php,1.138,1.139

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

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

Modified Files:
	bug.php 
Log Message:
Update of the old "Printable View"-link.


Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- bug.php	28 May 2005 18:11:52 -0000	1.138
+++ bug.php	20 Jul 2005 18:12:25 -0000	1.139
@@ -547,7 +547,7 @@
 }
 
 function show_bug_printable($bugid) {
-	global $db, $me, $t, $select, $QUERY, $restricted_projects;
+	global $db, $me, $t, $QUERY, $restricted_projects;
 
 	if (!is_numeric($bugid) or
 		!$row = $db->getRow(sprintf($QUERY['bug-printable'], $bugid,
@@ -557,14 +557,19 @@
 	}
 
 	$t->assign($row);
+
+	$bug_dependencies = $db->getAll("select b.bug_id, s.bug_open from ".TBL_BUG_DEPENDENCY." d, ".TBL_BUG." b, ".TBL_STATUS." s where d.bug_id = $bugid and d.depends_on = b.bug_id and b.status_id = s.status_id");
+
+	$bug_blocks = $db->getAll("select b.bug_id, s.bug_open from ".TBL_BUG_DEPENDENCY." d, ".TBL_BUG." b, ".TBL_STATUS." s where d.depends_on = $bugid and d.bug_id = b.bug_id and b.status_id = s.status_id");
+
 	$t->assign(array(
-		'bug_dependencies' => @join(', ', $db->getCol('select '.db_concat("'<a href=\"$me?op=show&bugid='", 'depends_on', '\'">#\'','depends_on', '\'</a>\'').' from '.TBL_BUG_DEPENDENCY." where bug_id = $bugid")),
-		'rev_bug_dependencies' => @join(', ', $db->getCol('select '.db_concat("'<a href=\"$me?op=show&bugid='", 'bug_id', '\'">#\'','bug_id', '\'</a>\'').' from '.TBL_BUG_DEPENDENCY." where depends_on = $bugid"))
+		'bug_dependencies' => $bug_dependencies,
+		'bug_blocks' => $bug_blocks
 		));
 
 	// Show the comments
 	$t->assign('comments', $db->getAll('select comment_text, c.created_date, login from '.TBL_COMMENT.' c, '.TBL_AUTH_USER." where bug_id = $bugid and c.created_by = user_id order by c.created_date"));
-	$t->render('bugdisplay-printable.html', translate("View Bug"));
+	$t->render('bugdisplay-printable.html', translate("View Bug"), 'wrap-popup.html');
 }
 
 ///