diff options
| author | W. Trevor King <wking@drexel.edu> | 2008-11-19 08:31:45 -0500 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2008-11-19 08:31:45 -0500 |
| commit | 1ca9b73832c1ca685fdba85f2be354e855bc0b5c (patch) | |
| tree | 4630f3ab280ca70298cbdf23b59eb1c5b493d2a4 /Bugs-Everywhere-Web/beweb | |
| parent | 3697d561fef7f4ee15a6b4d9906a9a9114412965 (diff) | |
| download | bugseverywhere-1ca9b73832c1ca685fdba85f2be354e855bc0b5c.tar.gz | |
Updated Bugs-Everywhere-Web to work with new architecture.
Diffstat (limited to 'Bugs-Everywhere-Web/beweb')
| -rw-r--r-- | Bugs-Everywhere-Web/beweb/controllers.py | 2 | ||||
| -rw-r--r-- | Bugs-Everywhere-Web/beweb/templates/bugs.kid | 2 | ||||
| -rw-r--r-- | Bugs-Everywhere-Web/beweb/templates/edit_bug.kid | 6 | ||||
| -rw-r--r-- | Bugs-Everywhere-Web/beweb/templates/projects.kid | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Bugs-Everywhere-Web/beweb/controllers.py b/Bugs-Everywhere-Web/beweb/controllers.py index 393f105..a64156f 100644 --- a/Bugs-Everywhere-Web/beweb/controllers.py +++ b/Bugs-Everywhere-Web/beweb/controllers.py @@ -4,7 +4,7 @@ import cherrypy import turbogears from turbogears import controllers, expose, validate, redirect, identity -from libbe.bugdir import tree_root, new_comment, NoRootEntry +from libbe.bugdir import tree_root, NoRootEntry from config import projects from prest import PrestHandler, provide_action diff --git a/Bugs-Everywhere-Web/beweb/templates/bugs.kid b/Bugs-Everywhere-Web/beweb/templates/bugs.kid index 376e77b..198aa94 100644 --- a/Bugs-Everywhere-Web/beweb/templates/bugs.kid +++ b/Bugs-Everywhere-Web/beweb/templates/bugs.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.cmdutil import unique_name +from libbe.names import unique_name from beweb.controllers import bug_url, project_url, bug_list_url from beweb.model import people_map people = people_map() diff --git a/Bugs-Everywhere-Web/beweb/templates/edit_bug.kid b/Bugs-Everywhere-Web/beweb/templates/edit_bug.kid index 34fcb99..276f610 100644 --- a/Bugs-Everywhere-Web/beweb/templates/edit_bug.kid +++ b/Bugs-Everywhere-Web/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, active_status, inactive_status, thread_comments +from libbe.bug import severity_values, status_values, thread_comments from libbe.utility import time_to_str from beweb.controllers import bug_list_url, comment_url from beweb.formatting import comment_body_xhtml, select_among @@ -20,14 +20,14 @@ people = people_map() <form method="post" action="."> <table> <tr><td>Status</td><td>Severity</td><td>Assigned To</td><td>Summary</td></tr> -<tr><td>${select_among("status", active_status+inactive_status, bug.status)}</td><td>${select_among("severity", severity_levels, bug.severity)}</td> +<tr><td>${select_among("status", status_values, bug.status)}</td><td>${select_among("severity", severity_values, 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:def="show_comment(comment, children)" class="comment"> <insetbox> <table> <tr><td>From</td><td>${comment.From}</td></tr> - <tr><td>Date</td><td>${time_to_str(comment.date)}</td></tr> + <tr><td>Date</td><td>${time_to_str(comment.time)}</td></tr> </table> <div py:content="comment_body_xhtml(comment)" py:strip="True"></div> <a href="${comment_url(project_id, bug.uuid, comment.uuid)}">Edit</a> diff --git a/Bugs-Everywhere-Web/beweb/templates/projects.kid b/Bugs-Everywhere-Web/beweb/templates/projects.kid index 09bde77..d5f9fd3 100644 --- a/Bugs-Everywhere-Web/beweb/templates/projects.kid +++ b/Bugs-Everywhere-Web/beweb/templates/projects.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.bug import severity_values def select_among(name, options, default): output = ['<select name="%s">' % name] for option in options: |