changeset 435:0e8ef6f17203

Merge with bd3f341cad457c5106bb16170ffac5c894f8e841
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 27 Aug 2010 22:28:50 +0200
parents 01cf2c9bd7ee (diff) bd3f341cad45 (current diff)
children 28f19fa562df
files
diffstat 3 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/pylons_app/controllers/summary.py	Fri Aug 27 18:48:47 2010 +0200
+++ b/pylons_app/controllers/summary.py	Fri Aug 27 22:28:50 2010 +0200
@@ -87,7 +87,7 @@
             k = k.replace('"', "'") #for js data compatibilty
             return k
                 
-        for cs in repo:
+        for cs in repo[:200]:#added limit 200 until fix #29 is made
             k = '%s-%s-%s' % (cs.date.timetuple()[0], cs.date.timetuple()[1],
                               cs.date.timetuple()[2])
             timetupple = [int(x) for x in k.split('-')]
@@ -124,9 +124,9 @@
         tmpl1 = u"""{label:"%s",data:%s,schema:["commits"]},"""
         for author in aggregate:
             
-            d += tmpl0 % (author.decode('utf8'),
+            d += tmpl0 % (author,
                           tmpl1 \
-                          % (author.decode('utf8'),
+                          % (author,
                         [{"time":x,
                           "commits":aggregate[author][x]['commits'],
                           "added":aggregate[author][x]['added'],
--- a/pylons_app/lib/helpers.py	Fri Aug 27 18:48:47 2010 +0200
+++ b/pylons_app/lib/helpers.py	Fri Aug 27 22:28:50 2010 +0200
@@ -220,7 +220,8 @@
     pygmentize function using pygments
     @param filenode:
     """
-    return literal(code_highlight(filenode.content, filenode.lexer, HtmlFormatter(**kwargs)))
+    return literal(code_highlight(filenode.content, 
+                                  filenode.lexer, HtmlFormatter(**kwargs)))
 
 def pygmentize_annotation(filenode, **kwargs):
     """
@@ -241,7 +242,8 @@
         return "color: rgb(%s) ! important;" % (', '.join(col))
         
     def url_func(changeset):
-        tooltip_html = "<div style='font-size:0.8em'><b>Author:</b> %s<br/><b>Date:</b> %s</b><br/><b>Message:</b> %s<br/></div>" 
+        tooltip_html = "<div style='font-size:0.8em'><b>Author:</b>"+\
+        " %s<br/><b>Date:</b> %s</b><br/><b>Message:</b> %s<br/></div>" 
         
         tooltip_html = tooltip_html % (changeset.author,
                                                changeset.date,
@@ -250,7 +252,7 @@
                                  changeset.raw_id)
         uri = link_to(
                 lnk_format,
-                url('changeset_home', repo_name='test',
+                url('changeset_home', repo_name=changeset.repository.name,
                     revision=changeset.raw_id),
                 style=get_color_string(changeset.raw_id),
                 class_='tooltip',
--- a/pylons_app/templates/changelog/changelog.html	Fri Aug 27 18:48:47 2010 +0200
+++ b/pylons_app/templates/changelog/changelog.html	Fri Aug 27 22:28:50 2010 +0200
@@ -61,7 +61,7 @@
 								<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>
 							</div>
 							<div class="message">
-								${h.link_to(h.wrap_paragraphs(cs.message.decode('utf-8','replace')),
+								${h.link_to(h.wrap_paragraphs(cs.message),
 								h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
 							</div>
 						</div>	
@@ -78,7 +78,7 @@
 										%endif						
 									%for p_cs in reversed(cs.parents):
 										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,
-											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message.decode('utf-8','replace'))}
+											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
 										</div>
 									%endfor								
 						</div>