[Collab-qa-commits] r1847 - udd/web

[Lucas Nussbaum]

Author: lucas
Date: 2010-12-05 21:03:34 +0000 (Sun, 05 Dec 2010)
New Revision: 1847

Modified:
   udd/web/bugs.cgi
Log:
fix dupe claimed ; fix delayed delay

Modified: udd/web/bugs.cgi
===================================================================
--- udd/web/bugs.cgi	2010-11-29 11:00:21 UTC (rev 1846)
+++ udd/web/bugs.cgi	2010-12-05 21:03:34 UTC (rev 1847)
@@ -301,7 +301,7 @@
 
 if cols['cclaimed']
   ids = rows.map { |r| r['id'] }.join(',')
-  stht = dbh.prepare("select id, tag from bugs_usertags where email='bugsquash at qa.debian.org' and id in (#{ids})")
+  stht = dbh.prepare("select distinct id, tag from bugs_usertags where email='bugsquash at qa.debian.org' and id in (#{ids})")
   stht.execute
   rowst = stht.fetch_all
   claimedbugs = {}
@@ -313,7 +313,7 @@
 
 if cols['cdeferred']
   ids = rows.map { |r| r['id'] }.join(',')
-  sthd = dbh.prepare("select id, deferred.source, deferred.version, extract (day from delayed_until) as du from deferred, deferred_closes where deferred.source = deferred_closes.source and deferred.version = deferred_closes.version and deferred_closes.id in (#{ids})")
+  sthd = dbh.prepare("select id, deferred.source, deferred.version, extract (day from delay_remaining) as du from deferred, deferred_closes where deferred.source = deferred_closes.source and deferred.version = deferred_closes.version and deferred_closes.id in (#{ids})")
   sthd.execute
   rowsd = sthd.fetch_all
   deferredbugs = {}