kallithea Changeset - cbfb853a0a4c

Changeset - cbfb853a0a4c

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-08-23 21:39:17
marcin@python-works.com

fixed bug when author had " in name, thus breaking the javascript data format
small fix to css for commit messages, and fixed a bug when message had some special chars that caused unicodeDecode error

3 files changed with 7 insertions and 4 deletions:

pylons_app/controllers/summary.py

pylons_app/public/css/style.css

pylons_app/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

pylons_app/controllers/summary.py

➞

Show inline comments

@@ @@ -39,96 +39,97 @@ log = logging.getLogger(__name__) @@
 class SummaryController(BaseController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(SummaryController, self).__before__()
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
         c.repo_changesets = Page(list(c.repo_info[:10]), page=1, items_per_page=20)
         e = request.environ
         uri = u'%(protocol)s://%(user)s@%(host)s/%(repo_name)s' % {
                                         'protocol': e.get('wsgi.url_scheme'),
                                         'user':str(c.hg_app_user.username),
                                         'host':e.get('HTTP_HOST'),
                                         'repo_name':c.repo_name, }
         c.clone_repo_url = uri
         c.repo_tags = OrderedDict()
         for name, hash in c.repo_info.tags.items()[:10]:
             c.repo_tags[name] = c.repo_info.get_changeset(hash)
         c.repo_branches = OrderedDict()
         for name, hash in c.repo_info.branches.items()[:10]:
             c.repo_branches[name] = c.repo_info.get_changeset(hash)
         c.commit_data = self.__get_commit_stats(c.repo_info)
         return render('summary/summary.html')
     def __get_commit_stats(self, repo):
         aggregate = OrderedDict()
         #graph range
         td = datetime.today() + timedelta(days=1)
         y = td.year
         m = td.month
         d = td.day
         c.ts_min = mktime((y, (td - timedelta(days=calendar.mdays[m] - 1)).month,
                             d, 0, 0, 0, 0, 0, 0,))
         c.ts_max = mktime((y, m, d, 0, 0, 0, 0, 0, 0,))
         def author_key_cleaner(k):
             k = person(k)
             k = k.replace('"', "'") #for js data compatibilty
             return k
         for cs in repo:
             k = '%s-%s-%s' % (cs.date.timetuple()[0], cs.date.timetuple()[1],
                               cs.date.timetuple()[2])
             timetupple = [int(x) for x in k.split('-')]
             timetupple.extend([0 for _ in xrange(6)])
             k = mktime(timetupple)
             if aggregate.has_key(author_key_cleaner(cs.author)):
                 if aggregate[author_key_cleaner(cs.author)].has_key(k):
                     aggregate[author_key_cleaner(cs.author)][k]["commits"] += 1
                     aggregate[author_key_cleaner(cs.author)][k]["added"] += len(cs.added)
                     aggregate[author_key_cleaner(cs.author)][k]["changed"] += len(cs.changed)
                     aggregate[author_key_cleaner(cs.author)][k]["removed"] += len(cs.removed)
                 else:
                     #aggregate[author_key_cleaner(cs.author)].update(dates_range)
                     if k >= c.ts_min and k <= c.ts_max:
                         aggregate[author_key_cleaner(cs.author)][k] = {}
                         aggregate[author_key_cleaner(cs.author)][k]["commits"] = 1
                         aggregate[author_key_cleaner(cs.author)][k]["added"] = len(cs.added)
                         aggregate[author_key_cleaner(cs.author)][k]["changed"] = len(cs.changed)
                         aggregate[author_key_cleaner(cs.author)][k]["removed"] = len(cs.removed)
             else:
                 if k >= c.ts_min and k <= c.ts_max:
                     aggregate[author_key_cleaner(cs.author)] = OrderedDict()
                     #aggregate[author_key_cleaner(cs.author)].update(dates_range)
                     aggregate[author_key_cleaner(cs.author)][k] = {}
                     aggregate[author_key_cleaner(cs.author)][k]["commits"] = 1
                     aggregate[author_key_cleaner(cs.author)][k]["added"] = len(cs.added)
                     aggregate[author_key_cleaner(cs.author)][k]["changed"] = len(cs.changed)
                     aggregate[author_key_cleaner(cs.author)][k]["removed"] = len(cs.removed)
         d = ''
         tmpl0 = u""""%s":%s"""
         tmpl1 = u"""{label:"%s",data:%s,schema:["commits"]},"""
         for author in aggregate:
             d += tmpl0 % (author.decode('utf8'),
                           tmpl1 \
                           % (author.decode('utf8'),
                         [{"time":x,
                           "commits":aggregate[author][x]['commits'],
                           "added":aggregate[author][x]['added'],
                           "changed":aggregate[author][x]['changed'],
                           "removed":aggregate[author][x]['removed'],
                           } for x in aggregate[author]]))

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -994,98 +994,98 @@ div.options a:hover @@
 #content div.box ol.decimal
+{
     margin: 10px 24px 10px 44px;
+}
 #content div.box ul.disc,
 #content div.box ul.circle
+{
     margin: 10px 24px 10px 38px;
+}
 #content div.box ul.square
+{
     margin: 10px 24px 10px 40px;
+}
 /* -----------------------------------------------------------
 	content -> right -> box / images
 ----------------------------------------------------------- */
 #content div.box img.left
+{
     margin: 10px 10px 10px 0;
 	border: none;
 	float: left;
+}
 #content div.box img.right
+{
     margin: 10px 0 10px 10px;
 	border: none;
 	float: right;
+}
 /* -----------------------------------------------------------
 	content -> right -> box / messages
 ----------------------------------------------------------- */
 #content div.box div.messages
+{
 	margin: 0 20px 0 20px;
     padding: 0;
 	clear: both;
 	overflow: hidden;
+}
 #content div.box div.message
+{
 	margin: 0 0 10px 0;
     padding: 0;
 	margin: 0 0 0px 0;
     padding: 0 0 10px 0;
 	clear: both;
 	overflow: hidden;
+}
 #content div.box div.message div.image
+{
 	margin: 9px 0 0 5px;
 	padding: 6px;
 	float: left;
+}
 #content div.box div.message div.image img
+{
     margin: 0;
     vertical-align: middle;
+}
 #content div.box div.message div.text
+{
     margin: 0;
     padding: 9px 6px 9px 6px;
     float: left;
+}
 #content div.box div.message div.dismiss
+{
     margin: 0;
     padding: 0;
     float: right;
+}
 #content div.box div.message div.dismiss a
+{
 	margin: 15px 14px 0 0;
 	padding: 0;
 	height: 16px;
 	width: 16px;
 	display: block;
 	background: url("../images/icons/cross.png") no-repeat;
+}
 #content div.box div.message div.text h1,
 #content div.box div.message div.text h2,
 #content div.box div.message div.text h3,
 #content div.box div.message div.text h4,
 #content div.box div.message div.text h5,
 #content div.box div.message div.text h6
+{

pylons_app/templates/changelog/changelog.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Changelog - %s') % c.repo_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('changelog')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
 		% if c.pagination:
 			<div id="graph">
 				<div id="graph_nodes">
 					<canvas id="graph_canvas"></canvas>
 				</div>
 				<div id="graph_content">
 					<div class="container_header">
         ${h.form(h.url.current(),method='get')}
         <div class="info_box">
           <span>${_('Show')}:</span>
           ${h.text('size',size=1,value=c.size)}
           <span>${_('revisions')}</span>
           ${h.submit('set',_('set'))}
         </div>
         ${h.end_form()}
 					</div>
 				%for cnt,cs in enumerate(c.pagination):
 					<div id="chg_${cnt+1}" class="container">
 						<div class="left">
 							<div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div>
 								<span class="logtags">
 									<span class="branchtag">${cs.branch}</span>
 									%for tag in cs.tags:
 										<span class="tagtag">${tag}</span>
 									%endfor
 								</span>
 							<div class="author">
 								<div class="gravatar">
 									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>
 								</div>
 								<span>${h.person(cs.author)}</span><br/>
 								<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),
+								${h.link_to(h.wrap_paragraphs(cs.message.decode('utf-8','replace')),
 								h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
 							</div>
 						</div>
 						<div class="right">
 									<div class="changes">
 										<span class="removed" title="${_('removed')}">${len(cs.removed)}</span>
 										<span class="changed" title="${_('changed')}">${len(cs.changed)}</span>
 										<span class="added" title="${_('added')}">${len(cs.added)}</span>
 									</div>
 										%if len(cs.parents)>1:
 										<div class="merge">
 											${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>
 										</div>
 										%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)}
+											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message.decode('utf-8','replace'))}
 										</div>
 									%endfor
 						</div>
 					</div>
 				%endfor
 				<div class="pagination-wh pagination-left">
 					${c.pagination.pager('$link_previous ~2~ $link_next')}
 				</div>
 				</div>
 			</div>
 			<script type="text/javascript" src="/js/graph.js"></script>
 			<script type="text/javascript">
 				YAHOO.util.Event.onDOMReady(function(){
 					function set_canvas() {
 						var c = document.getElementById('graph_nodes');
 						var t = document.getElementById('graph_content');
 						canvas = document.getElementById('graph_canvas');
 						var div_h = t.clientHeight;
 						c.style.height=div_h+'px';
 						canvas.setAttribute('height',div_h);
 						canvas.setAttribute('width',160);
 					};
 					set_canvas();
 					var jsdata = ${c.jsdata|n};
 					var r = new BranchRenderer();
 					r.render(jsdata);
 				});
 			</script>
 		%else:
 			${_('There are no changes yet')}
 		%endif
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)