Mercurial > hg > bts-webui

changeset 26:23ce17c621f7 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidied up. Fixed some small bugs
author marga
date Tue, 21 Aug 2007 15:36:11 +0000
parents 82700cdc9687
children b94c3e9a5423
files bts_webui/amancay/bts_queries.py bts_webui/amancay/models.py bts_webui/amancay/tables.py bts_webui/amancay/templates/bug.html bts_webui/amancay/toolbox.py bts_webui/amancay/urls.py bts_webui/amancay/views.py
diffstat 7 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/bts_webui/amancay/bts_queries.py
+++ b/bts_webui/amancay/bts_queries.py
@@ -48,7 +48,6 @@
 			return [ result.item.value ]
 
 	def get_bugs_status(self, bug_numbers):
-		print bug_numbers
 		result = self.server.get_status(bug_numbers)
 		return self.process_result(result)
 	
--- a/bts_webui/amancay/models.py
+++ b/bts_webui/amancay/models.py
@@ -13,7 +13,7 @@
 	number = models.IntegerField()
 
 	def __str__(self):
-		return self.number
+		return str(self.number)
 
 class EmailItem(models.Model):
 	user = models.ForeignKey(User)
--- a/bts_webui/amancay/tables.py
+++ b/bts_webui/amancay/tables.py
@@ -63,9 +63,7 @@
 		submitter_emails = request.session.get('submitter_emails')
 	if (submitter_emails):
 		bugs = queries.get_submitters_bugs(submitter_emails)
-		print bugs
 		bugs.sort(reverse=True)
-		print bugs
 	return render_bug_table(request, queries, "Latest submitted bugs",
 	bugs, 15, "submitted_bugs")
 
--- a/bts_webui/amancay/templates/bug.html
+++ b/bts_webui/amancay/templates/bug.html
@@ -4,7 +4,7 @@
 {% block title %}Amancay BTS interface - Bug View{% endblock %}
 
 {% block main_content %}
-<div class="bug_log">
+<div class="bug_log" id="bug_list">
 {% if info_to_user %}
 <div class="info_to_user">{{ info_to_user }}</div>
 {% endif %}
--- a/bts_webui/amancay/toolbox.py
+++ b/bts_webui/amancay/toolbox.py
@@ -24,7 +24,6 @@
 
 	# Initialization
 	user = request.user
-	print user
 	toolbox = {}
 
 	# Fill the info according to the type of toolbox needed
--- a/bts_webui/amancay/urls.py
+++ b/bts_webui/amancay/urls.py
@@ -3,8 +3,8 @@
 urlpatterns = patterns('',
 
 	# Normal pages
-	(r'^$', 'bts_webui.amancay.search.search',),
-	(r'^index', 'bts_webui.amancay.search.search',),
+	(r'^$', 'bts_webui.amancay.views.index',),
+	(r'^index', 'bts_webui.amancay.views.index',),
 
 	# Toolboxes
 	(r'toolbox', 'bts_webui.amancay.toolbox.render_toolbox',),
--- a/bts_webui/amancay/views.py
+++ b/bts_webui/amancay/views.py
@@ -19,18 +19,18 @@
 
 # Tables POST processing
 from tables import process_post, selected_bugs
+from search import search
 
 # The index page doesn't really do much.
 def index(request):
 	item_list = process_post(request)
-
 	# Check if it's AJAX or HTML
 	if (request.GET.has_key('xhr')):
 		return HttpResponse( simplejson.dumps({"item_list":	item_list}),
 		                     mimetype='application/javascript' )
 	else:
 		# TODO: choose which view to show.
-		return selected_bugs(request)
+		return search(request)
 
 
 # Package page