kallithea Changeset - dee0e7eb0370

Changeset - dee0e7eb0370

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

*** failed to import extension hggit: No module named hggit - 15 years ago 2010-08-26 22:09:55

removed decodes, thus it should be implemented on vcs side
fixed bug on annotation links in helpers

3 files changed with 9 insertions and 7 deletions:

pylons_app/controllers/summary.py

pylons_app/lib/helpers.py

pylons_app/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

pylons_app/controllers/summary.py

➞

Show inline comments

@@ @@ -124,9 +124,9 @@ class SummaryController(BaseController): @@
         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'],

pylons_app/lib/helpers.py

➞

Show inline comments

@@ @@ -220,7 +220,8 @@ def pygmentize(filenode, **kwargs): @@
     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 @@ def pygmentize_annotation(filenode, **kw @@
         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 @@ def pygmentize_annotation(filenode, **kw @@
                                  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',

pylons_app/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -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>

0 comments (0 inline, 0 general)