From 43b0a51403b4698903783377450690972fe7bc70 Mon Sep 17 00:00:00 2001
From: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Thu, 29 Dec 2005 10:14:32 -0500
Subject: Removed debugging code

---
 beweb/beweb/prest.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'beweb')

diff --git a/beweb/beweb/prest.py b/beweb/beweb/prest.py
index 7de1290..e6b7cdf 100644
--- a/beweb/beweb/prest.py
+++ b/beweb/beweb/prest.py
@@ -56,7 +56,6 @@ class PrestHandler(object):
         if action is not None:
             return action(*new_args, **kwargs)
         else:
-            print child.__class__.__name__
             return child.dispatch(*new_args, **kwargs)
 
     def get_action(self, **kwargs):
-- 
cgit 


From bb1b72847742ebe56682b0f7f2bd5a3d8037fc4b Mon Sep 17 00:00:00 2001
From: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Mon, 2 Jan 2006 14:01:48 -0500
Subject: Fixed tense

---
 beweb/beweb/templates/about.kid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'beweb')

diff --git a/beweb/beweb/templates/about.kid b/beweb/beweb/templates/about.kid
index 212bc1d..45d0093 100644
--- a/beweb/beweb/templates/about.kid
+++ b/beweb/beweb/templates/about.kid
@@ -12,7 +12,7 @@
     Bentley and Oleg Romanyshyn.
 </p>
 <p>
-    Development was sponsored by 
+    Development is sponsored by 
     <a href="http://panoramicfeedback.com/">Panoramic Feedback</a>.
 </p>
 <p>
-- 
cgit 


From 74df8a9003736ca76dee3b94433edd4e9e04dbc3 Mon Sep 17 00:00:00 2001
From: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Mon, 2 Jan 2006 15:53:32 -0500
Subject: Added assignment of bugs to people to web UI

---
 beweb/beweb/controllers.py         |  6 +++++-
 beweb/beweb/templates/bugs.kid     |  3 ++-
 beweb/beweb/templates/edit_bug.kid | 21 ++++++++++++++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'beweb')

diff --git a/beweb/beweb/controllers.py b/beweb/beweb/controllers.py
index b0f13db..cbd0816 100644
--- a/beweb/beweb/controllers.py
+++ b/beweb/beweb/controllers.py
@@ -84,10 +84,14 @@ class Bug(PrestHandler):
         raise cherrypy.HTTPRedirect(bug_url(bug_data['project'], bug.uuid))
 
     @provide_action("action", "Update")
-    def update(self, bug_data, bug, status, severity, summary, action):
+    def update(self, bug_data, bug, status, severity, summary, assigned, 
+               action):
         bug.status = status
         bug.severity = severity
         bug.summary = summary
+        if assigned == "":
+            assigned = None
+        bug.assigned = assigned
         bug.save()
         raise cherrypy.HTTPRedirect(bug_list_url(bug_data["project"]))
 
diff --git a/beweb/beweb/templates/bugs.kid b/beweb/beweb/templates/bugs.kid
index b8b2ff7..07d8dee 100644
--- a/beweb/beweb/templates/bugs.kid
+++ b/beweb/beweb/templates/bugs.kid
@@ -2,6 +2,7 @@
 <?python
 from libbe.cmdutil import unique_name
 from beweb.controllers import bug_url, project_url, bug_list_url
+from beweb.config import people
 def row_class(bug):
     if bug.status == "closed":
         return "closed"
@@ -20,7 +21,7 @@ def row_class(bug):
 <h1>Bug list for ${project_name}</h1>
 <table>
 <tr><td>ID</td><td>Status</td><td>Severity</td><td>Assigned To</td><td>Summary</td></tr>
-<div py:for="bug in bugs" py:strip="True"><tr class="${row_class(bug)}" py:if="bug.status != 'closed' or show_closed"><td><a href="${bug_url(project_id, bug.uuid)}">${unique_name(bug, bugs[:])}</a></td><td>${bug.status}</td><td>${bug.severity}</td><td>${bug.assigned}</td><td>${bug.summary}</td></tr>
+<div py:for="bug in bugs" py:strip="True"><tr class="${row_class(bug)}" py:if="bug.status != 'closed' or show_closed"><td><a href="${bug_url(project_id, bug.uuid)}">${unique_name(bug, bugs[:])}</a></td><td>${bug.status}</td><td>${bug.severity}</td><td>${people.get(bug.assigned, bug.assigned)}</td><td>${bug.summary}</td></tr>
 </div>
 </table>
 <a href="${project_url()}">Project list</a>
diff --git a/beweb/beweb/templates/edit_bug.kid b/beweb/beweb/templates/edit_bug.kid
index 49dbe52..57f1940 100644
--- a/beweb/beweb/templates/edit_bug.kid
+++ b/beweb/beweb/templates/edit_bug.kid
@@ -3,14 +3,28 @@
 from libbe.bugdir import severity_levels
 from libbe.utility import time_to_str 
 from beweb.controllers import bug_list_url, comment_url
-def select_among(name, options, default):
+from beweb.config import people
+def select_among(name, options, default, display_names=None):
     output = ['<select name="%s">' % name]
     for option in options:
         if option == default:
             selected = ' selected="selected"'
         else:
             selected = ""
-        output.append("<option%s>%s</option>" % (selected, option))
+        if display_names is None:
+            display_name = None
+        else:
+            display_name = display_names.get(option)
+
+        if option is None:
+            option = ""
+        if display_name is None:
+            display_name = option
+            value = ""
+        else:
+            value = ' value="%s"' % option
+        output.append("<option%s%s>%s</option>" % (selected, value, 
+                                                   display_name))
     output.append("</select>")
     return XML("".join(output))
 ?>
@@ -27,7 +41,8 @@ def select_among(name, options, default):
 <form method="post">
 <table>
 <tr><td>Status</td><td>Severity</td><td>Assigned To</td><td>Summary</td></tr>
-<tr><td>${select_among("status", ["open", "closed", "in-progress"], bug.status)}</td><td>${select_among("severity", severity_levels, bug.severity)}</td><td>${bug.assigned}</td><td><input name="summary" value="${bug.summary}" size="80" /></td></tr>
+<tr><td>${select_among("status", ["open", "closed", "in-progress"], bug.status)}</td><td>${select_among("severity", severity_levels, bug.severity)}</td>
+<td>${select_among("assigned", people.keys()+[None], bug.assigned, people)}</td><td><input name="summary" value="${bug.summary}" size="80" /></td></tr>
 </table>
 <div py:for="comment in bug.list_comments()" class="comment">
     <insetbox>
-- 
cgit 


From 427e95ba1074f3d2f48c1cef32e454d6bcd5466a Mon Sep 17 00:00:00 2001
From: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Wed, 25 Jan 2006 17:00:13 -0500
Subject: Added more possible bug statuses

---
 beweb/beweb/templates/edit_bug.kid | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'beweb')

diff --git a/beweb/beweb/templates/edit_bug.kid b/beweb/beweb/templates/edit_bug.kid
index 57f1940..89c4208 100644
--- a/beweb/beweb/templates/edit_bug.kid
+++ b/beweb/beweb/templates/edit_bug.kid
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?python
-from libbe.bugdir import severity_levels
+from libbe.bugdir import severity_levels, active_status, inactive_status
 from libbe.utility import time_to_str 
 from beweb.controllers import bug_list_url, comment_url
 from beweb.config import people
@@ -41,7 +41,7 @@ def select_among(name, options, default, display_names=None):
 <form method="post">
 <table>
 <tr><td>Status</td><td>Severity</td><td>Assigned To</td><td>Summary</td></tr>
-<tr><td>${select_among("status", ["open", "closed", "in-progress"], bug.status)}</td><td>${select_among("severity", severity_levels, bug.severity)}</td>
+<tr><td>${select_among("status", active_status+inactive_status, bug.status)}</td><td>${select_among("severity", severity_levels, bug.severity)}</td>
 <td>${select_among("assigned", people.keys()+[None], bug.assigned, people)}</td><td><input name="summary" value="${bug.summary}" size="80" /></td></tr>
 </table>
 <div py:for="comment in bug.list_comments()" class="comment">
-- 
cgit 


From 41a97f69328e788001d32b1f1dd378eaf536eed4 Mon Sep 17 00:00:00 2001
From: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Wed, 25 Jan 2006 17:04:26 -0500
Subject: Updated web UI display of inactive bugs

---
 beweb/beweb/templates/bugs.kid | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'beweb')

diff --git a/beweb/beweb/templates/bugs.kid b/beweb/beweb/templates/bugs.kid
index 07d8dee..c174d00 100644
--- a/beweb/beweb/templates/bugs.kid
+++ b/beweb/beweb/templates/bugs.kid
@@ -4,7 +4,7 @@ from libbe.cmdutil import unique_name
 from beweb.controllers import bug_url, project_url, bug_list_url
 from beweb.config import people
 def row_class(bug):
-    if bug.status == "closed":
+    if not bug.active is True:
         return "closed"
     else:
         return ""
@@ -21,7 +21,7 @@ def row_class(bug):
 <h1>Bug list for ${project_name}</h1>
 <table>
 <tr><td>ID</td><td>Status</td><td>Severity</td><td>Assigned To</td><td>Summary</td></tr>
-<div py:for="bug in bugs" py:strip="True"><tr class="${row_class(bug)}" py:if="bug.status != 'closed' or show_closed"><td><a href="${bug_url(project_id, bug.uuid)}">${unique_name(bug, bugs[:])}</a></td><td>${bug.status}</td><td>${bug.severity}</td><td>${people.get(bug.assigned, bug.assigned)}</td><td>${bug.summary}</td></tr>
+<div py:for="bug in bugs" py:strip="True"><tr class="${row_class(bug)}" py:if="bug.active or show_closed"><td><a href="${bug_url(project_id, bug.uuid)}">${unique_name(bug, bugs[:])}</a></td><td>${bug.status}</td><td>${bug.severity}</td><td>${people.get(bug.assigned, bug.assigned)}</td><td>${bug.summary}</td></tr>
 </div>
 </table>
 <a href="${project_url()}">Project list</a>
-- 
cgit 


From 4eb3e0d84a15aabbf723fe9b3696dfc81efd9bb0 Mon Sep 17 00:00:00 2001
From: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Wed, 25 Jan 2006 17:13:06 -0500
Subject: Show number of comments in bug list

---
 beweb/beweb/templates/bugs.kid | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'beweb')

diff --git a/beweb/beweb/templates/bugs.kid b/beweb/beweb/templates/bugs.kid
index c174d00..30004fc 100644
--- a/beweb/beweb/templates/bugs.kid
+++ b/beweb/beweb/templates/bugs.kid
@@ -20,8 +20,8 @@ def row_class(bug):
 <body>
 <h1>Bug list for ${project_name}</h1>
 <table>
-<tr><td>ID</td><td>Status</td><td>Severity</td><td>Assigned To</td><td>Summary</td></tr>
-<div py:for="bug in bugs" py:strip="True"><tr class="${row_class(bug)}" py:if="bug.active or show_closed"><td><a href="${bug_url(project_id, bug.uuid)}">${unique_name(bug, bugs[:])}</a></td><td>${bug.status}</td><td>${bug.severity}</td><td>${people.get(bug.assigned, bug.assigned)}</td><td>${bug.summary}</td></tr>
+<tr><td>ID</td><td>Status</td><td>Severity</td><td>Assigned To</td><td>Comments</td><td>Summary</td></tr>
+<div py:for="bug in bugs" py:strip="True"><tr class="${row_class(bug)}" py:if="bug.active or show_closed"><td><a href="${bug_url(project_id, bug.uuid)}">${unique_name(bug, bugs[:])}</a></td><td>${bug.status}</td><td>${bug.severity}</td><td>${people.get(bug.assigned, bug.assigned)}</td><td>${len(list(bug.iter_comment_ids()))}</td><td>${bug.summary}</td></tr>
 </div>
 </table>
 <a href="${project_url()}">Project list</a>
-- 
cgit