[phpBT-dev] CVS: phpbt include.php,1.137,1.138 query.php,1.104,1.105

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

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

Modified Files:
	include.php query.php 
Log Message:
RFE #784058 - show number of comments, attachments and/or votes in buglist


Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- include.php	22 Aug 2005 20:30:56 -0000	1.137
+++ include.php	22 Aug 2005 20:44:16 -0000	1.138
@@ -109,7 +109,10 @@
 	'component_name' => 'Component',
 	'os_name' => 'OS',
 	'browser_string' => 'Browser',
-	'close_date' => 'Closed Date'
+	'close_date' => 'Closed Date',
+	'comments' => 'Comments',
+	'attachments' => 'Attachments',
+	'votes' => 'Votes'
 	);
 
 $default_db_fields = array('bug_id', 'title', 'reporter', 'owner',

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- query.php	22 Aug 2005 20:40:08 -0000	1.104
+++ query.php	22 Aug 2005 20:44:16 -0000	1.105
@@ -298,7 +298,10 @@
 		'component_name' => 'component.component_name',
 		'os_name' => 'os.os_name',
 		'browser_string' => 'browser_string',
-		'close_date' => 'close_date'
+		'close_date' => 'close_date',
+		'comments' => 'count(distinct comment.comment_id) as comments',
+		'attachments' => 'count(distinct attachment.attachment_id) as attachments',
+		'votes' => 'count(distinct vote.user_id) as votes'
 	);
 
 	$db_headers = array(
@@ -324,7 +327,10 @@
 		'site_name' => 'site.sort_order',
 		'browser_string' => 'browser_string',
 		'resolution_name' => 'resolution.sort_order',
-		'close_date' => 'close_date'
+		'close_date' => 'close_date',
+		'comments' => 'comments',
+		'attachments' => 'attachments',
+		'votes' => 'votes'
 	);
 
 	extract($_GET);
@@ -348,7 +354,7 @@
 			$order = $_SESSION['queryinfo']['order'];
 			$sort = $_SESSION['queryinfo']['sort'];
 		} else {
-			$order = 'bug_id';
+			$order = 'b.bug_id';
 			$sort = 'asc';
 		}
 	}