diff options
| -rw-r--r-- | beweb/beweb/templates/edit_bug.kid | 4 | ||||
| -rw-r--r-- | libbe/bugdir.py | 6 |
2 files changed, 6 insertions, 4 deletions
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"> diff --git a/libbe/bugdir.py b/libbe/bugdir.py index 9fee680..d30bc75 100644 --- a/libbe/bugdir.py +++ b/libbe/bugdir.py @@ -210,13 +210,15 @@ def checked_property(name, valid): return property(getter, setter) severity_levels = ("wishlist", "minor", "serious", "critical", "fatal") +active_status = ("open", "in-progress", "waiting", "new", "verified") +inactive_status = ("closed", "disabled", "fixed", "wontfix", "waiting") severity_value = {} for i in range(len(severity_levels)): severity_value[severity_levels[i]] = i class Bug(object): - status = checked_property("status", (None, "open", "closed", "in-progress")) + status = checked_property("status", (None,)+active_status+inactive_status) severity = checked_property("severity", (None, "wishlist", "minor", "serious", "critical", "fatal")) @@ -244,7 +246,7 @@ class Bug(object): return os.path.join(self.path, self.uuid, file) def _get_active(self): - return self.status in ("open", "in-progress") + return self.status in active_status active = property(_get_active) |