Mercurial > kallithea
comparison rhodecode/controllers/journal.py @ 1421:c6b811f11c94 beta
Javascripts rewrite: updated yui to latest 2.9, simplified ajax loading for multiple pages. Removed YUI dev package
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 09 Jul 2011 20:07:59 +0200 |
parents | 50e41777675d |
children | bf263968da47 e7eef7a1db6a |
comparison
equal
deleted
inserted
replaced
1420:a2fe0ac8d007 | 1421:c6b811f11c94 |
---|---|
68 c.journal_pager = Page(journal, page=p, items_per_page=20) | 68 c.journal_pager = Page(journal, page=p, items_per_page=20) |
69 | 69 |
70 c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager) | 70 c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager) |
71 | 71 |
72 c.journal_data = render('journal/journal_data.html') | 72 c.journal_data = render('journal/journal_data.html') |
73 if request.params.get('partial'): | 73 if request.environ.get('HTTP_X_PARTIAL_XHR'): |
74 return c.journal_data | 74 return c.journal_data |
75 return render('journal/journal.html') | 75 return render('journal/journal.html') |
76 | 76 |
77 def _get_daily_aggregate(self, journal): | 77 def _get_daily_aggregate(self, journal): |
78 groups = [] | 78 groups = [] |
155 c.journal_pager = Page(journal, page=p, items_per_page=20) | 155 c.journal_pager = Page(journal, page=p, items_per_page=20) |
156 | 156 |
157 c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager) | 157 c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager) |
158 | 158 |
159 c.journal_data = render('journal/journal_data.html') | 159 c.journal_data = render('journal/journal_data.html') |
160 if request.params.get('partial'): | 160 if request.environ.get('HTTP_X_PARTIAL_XHR'): |
161 return c.journal_data | 161 return c.journal_data |
162 return render('journal/public_journal.html') | 162 return render('journal/public_journal.html') |
163 | 163 |
164 @LoginRequired(api_access=True) | 164 @LoginRequired(api_access=True) |
165 def public_journal_atom(self): | 165 def public_journal_atom(self): |