Mercurial > kallithea

changeset 5820:a670727a096a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: aggregate
author timeless@gmail.com
date Tue, 03 May 2016 05:02:41 +0000
parents e9c9f2e07de8
children b68e7f1bf85b
files kallithea/controllers/journal.py kallithea/templates/journal/journal_data.html
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/journal.py	Tue May 03 05:01:51 2016 +0000
+++ b/kallithea/controllers/journal.py	Tue May 03 05:02:41 2016 +0000
@@ -205,7 +205,7 @@
             return url.current(filter=c.search_term, **kw)
 
         c.journal_pager = Page(journal, page=p, items_per_page=20, url=url_generator)
-        c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
+        c.journal_day_aggregate = self._get_daily_aggregate(c.journal_pager)
 
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return render('journal/journal_data.html')
@@ -339,7 +339,7 @@
 
         c.journal_pager = Page(journal, page=p, items_per_page=20)
 
-        c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
+        c.journal_day_aggregate = self._get_daily_aggregate(c.journal_pager)
 
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return render('journal/journal_data.html')
--- a/kallithea/templates/journal/journal_data.html	Tue May 03 05:01:51 2016 +0000
+++ b/kallithea/templates/journal/journal_data.html	Tue May 03 05:02:41 2016 +0000
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 
-%if c.journal_day_aggreagate:
-    %for day,items in c.journal_day_aggreagate:
+%if c.journal_day_aggregate:
+    %for day,items in c.journal_day_aggregate:
      <div class="journal_day">${day}</div>
         % for user,entries in items:
             <div class="journal_container">