[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-73-g87f2a2e

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 544799e0455b1d752e69e8285593f1ccf026889a
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Nov 5 13:21:55 2011 +0100

    show if the bug is already closed (it usually happens when the bug was closed recently and it's not archived yet); thanks to Elora HRanma for the report; Closes: #586155

diff --git a/debian/changelog b/debian/changelog
index 47c815e..bc644ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,12 @@ reportbug (6.3) UNRELEASED; urgency=low
     Closes: #640249
   * Use madison.cgi (from QA) to check for newer versions available; thanks to
     Bernd Zeimetz for the report; Closes: #601679
+  * reportbug/ui/*_ui.py
+    - show if the bug is already closed (it usually happens when the bug was
+      closed recently and it's not archived yet); thanks to Elora HRanma for the
+      report; Closes: #586155
 
- -- Sandro Tosi <morph at debian.org>  Fri, 04 Nov 2011 23:12:37 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 05 Nov 2011 13:17:21 +0100
 
 reportbug (6.2.2) unstable; urgency=low
 
diff --git a/reportbug/ui/gtk2_ui.py b/reportbug/ui/gtk2_ui.py
index 1e834d2..51bd829 100644
--- a/reportbug/ui/gtk2_ui.py
+++ b/reportbug/ui/gtk2_ui.py
@@ -213,6 +213,7 @@ class Bug (object):
         self.id = bug.bug_num
         self.tag = u', '.join(bug.tags)
         self.package = bug.package
+        self.status = bug.pending
         self.reporter = bug.originator
         self.date = bug.date
         self.severity = bug.severity
@@ -226,6 +227,7 @@ class Bug (object):
         yield self.tag
         yield self.package
         yield self.info
+        yield self.status
         yield self.reporter
         yield self.date
         yield self.severity
@@ -935,7 +937,7 @@ class HandleBTSQueryPage (TreePage):
         self.view = gtk.TreeView ()
         self.view.set_rules_hint (True)
         scrolled = create_scrollable (self.view)
-        self.columns = ['ID', 'Tag', 'Package', 'Description', 'Reporter', 'Date', 'Severity', 'Version',
+        self.columns = ['ID', 'Tag', 'Package', 'Description', 'Status', 'Reporter', 'Date', 'Severity', 'Version',
                         'Filed date', 'Modified date']
         for col in zip (self.columns, range (len (self.columns))):
             column = gtk.TreeViewColumn (col[0], gtk.CellRendererText (), text=col[1])
diff --git a/reportbug/ui/text_ui.py b/reportbug/ui/text_ui.py
index 7e3a618..3d87fc1 100644
--- a/reportbug/ui/text_ui.py
+++ b/reportbug/ui/text_ui.py
@@ -550,8 +550,12 @@ def handle_bts_query(package, bts, timeout, mirrors=None, http_proxy="",
             # generations and map()
             # second item is a list of bugs report
             for bug in entry[1]:
+                # show if the bugs is already resolved
+                done = ''
+                if bug.pending == 'done':
+                    done = '  [RESOLVED]'
                 # we take the info we need (bug number and subject)
-                bugs_new.append("#%d  %s" %(bug.bug_num, bug.subject))
+                bugs_new.append("#%d  %s%s" %(bug.bug_num, bug.subject, done))
                 # and at the same time create a list of bugs numbers
                 bugs_numbers.append(bug.bug_num)
             # then we sort both the lists
diff --git a/reportbug/ui/urwid_ui.py b/reportbug/ui/urwid_ui.py
index 91645ef..7f235b9 100644
--- a/reportbug/ui/urwid_ui.py
+++ b/reportbug/ui/urwid_ui.py
@@ -582,7 +582,11 @@ def handle_bts_query(package, bts, timeout, mirrors=None, http_proxy="",
                 buglist.append( ('---', t) )
                 buglist_tmp = []
                 for bug in bugs:
-                    buglist_tmp.append( (str(bug.bug_num), bug.subject) )
+                    # show if the bugs is already resolved
+                    done = ''
+                    if bug.pending == 'done':
+                        done = '  [RESOLVED]'
+                    buglist_tmp.append( (str(bug.bug_num), bug.subject+done) )
                 # append the sorted list of bugs for this severity
                 map(buglist.append, sorted(buglist_tmp, reverse=latest_first))
 

-- 
Reportbug - reports bugs in the Debian distribution