Show More
@@ -141,8 +141,8 b' class AdminController(BaseController):' | |||
|
141 | 141 | return url.current(filter=c.search_term, **kw) |
|
142 | 142 | |
|
143 | 143 | c.users_log = Page(users_log, page=p, items_per_page=10, url=url_generator) |
|
144 | c.log_data = render('admin/admin_log.html') | |
|
145 | 144 | |
|
146 | 145 | if request.environ.get('HTTP_X_PARTIAL_XHR'): |
|
147 | return c.log_data | |
|
146 | return render('admin/admin_log.html') | |
|
147 | ||
|
148 | 148 | return render('admin/admin.html') |
@@ -53,9 +53,7 b' class FollowersController(BaseRepoContro' | |||
|
53 | 53 | .order_by(UserFollowing.follows_from) |
|
54 | 54 | c.followers_pager = Page(d, page=p, items_per_page=20) |
|
55 | 55 | |
|
56 | c.followers_data = render('/followers/followers_data.html') | |
|
57 | ||
|
58 | 56 | if request.environ.get('HTTP_X_PARTIAL_XHR'): |
|
59 |
return |
|
|
57 | return render('/followers/followers_data.html') | |
|
60 | 58 | |
|
61 | 59 | return render('/followers/followers.html') |
@@ -123,10 +123,8 b' class ForksController(BaseRepoController' | |||
|
123 | 123 | d.append(r) |
|
124 | 124 | c.forks_pager = Page(d, page=p, items_per_page=20) |
|
125 | 125 | |
|
126 | c.forks_data = render('/forks/forks_data.html') | |
|
127 | ||
|
128 | 126 | if request.environ.get('HTTP_X_PARTIAL_XHR'): |
|
129 |
return |
|
|
127 | return render('/forks/forks_data.html') | |
|
130 | 128 | |
|
131 | 129 | return render('/forks/forks.html') |
|
132 | 130 |
@@ -207,9 +207,8 b' class JournalController(BaseController):' | |||
|
207 | 207 | c.journal_pager = Page(journal, page=p, items_per_page=20, url=url_generator) |
|
208 | 208 | c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager) |
|
209 | 209 | |
|
210 | c.journal_data = render('journal/journal_data.html') | |
|
211 | 210 | if request.environ.get('HTTP_X_PARTIAL_XHR'): |
|
212 |
return |
|
|
211 | return render('journal/journal_data.html') | |
|
213 | 212 | |
|
214 | 213 | repos_list = Session().query(Repository)\ |
|
215 | 214 | .filter(Repository.user_id == |
@@ -350,9 +349,9 b' class JournalController(BaseController):' | |||
|
350 | 349 | |
|
351 | 350 | c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager) |
|
352 | 351 | |
|
353 | c.journal_data = render('journal/journal_data.html') | |
|
354 | 352 | if request.environ.get('HTTP_X_PARTIAL_XHR'): |
|
355 |
return |
|
|
353 | return render('journal/journal_data.html') | |
|
354 | ||
|
356 | 355 | return render('journal/public_journal.html') |
|
357 | 356 | |
|
358 | 357 | @LoginRequired(api_access=True) |
@@ -204,10 +204,8 b' class PullrequestsController(BaseRepoCon' | |||
|
204 | 204 | |
|
205 | 205 | c.pullrequests_pager = Page(c.pull_requests, page=p, items_per_page=10) |
|
206 | 206 | |
|
207 | c.pullrequest_data = render('/pullrequests/pullrequest_data.html') | |
|
208 | ||
|
209 | 207 | if request.environ.get('HTTP_X_PARTIAL_XHR'): |
|
210 |
return |
|
|
208 | return render('/pullrequests/pullrequest_data.html') | |
|
211 | 209 | |
|
212 | 210 | return render('/pullrequests/pullrequest_show_all.html') |
|
213 | 211 |
@@ -27,7 +27,7 b'' | |||
|
27 | 27 | <!-- end box / title --> |
|
28 | 28 | <div class="table"> |
|
29 | 29 | <div id="user_log"> |
|
30 | ${c.log_data} | |
|
30 | <%include file='admin_log.html'/> | |
|
31 | 31 | </div> |
|
32 | 32 | </div> |
|
33 | 33 | </div> |
@@ -22,7 +22,7 b'' | |||
|
22 | 22 | <!-- end box / title --> |
|
23 | 23 | <div class="table"> |
|
24 | 24 | <div id="followers"> |
|
25 |
|
|
|
25 | <%include file='followers_data.html'/> | |
|
26 | 26 | </div> |
|
27 | 27 | </div> |
|
28 | 28 | </div> |
@@ -23,7 +23,7 b'' | |||
|
23 | 23 | <!-- end box / title --> |
|
24 | 24 | <div class="table"> |
|
25 | 25 | <div id="forks"> |
|
26 |
|
|
|
26 | <%include file='forks_data.html'/> | |
|
27 | 27 | </div> |
|
28 | 28 | </div> |
|
29 | 29 | </div> |
@@ -36,7 +36,9 b'' | |||
|
36 | 36 | </li> |
|
37 | 37 | </ul> |
|
38 | 38 | </div> |
|
39 |
<div id="journal"> |
|
|
39 | <div id="journal"> | |
|
40 | <%include file='journal_data.html'/> | |
|
41 | </div> | |
|
40 | 42 | </div> |
|
41 | 43 | <div class="box box-right"> |
|
42 | 44 | <!-- box / title --> |
General Comments 0
You need to be logged in to leave comments.
Login now