kallithea Changeset - a40824531f68

Changeset - a40824531f68

Parent rev.

Child rev.

[Not reviewed]

default

0 11 0

Thomas De Schampheleire - 11 years ago 2015-02-21 22:04:54
thomas.de_schampheleire@alcatel-lucent.com

controllers: don't pass rendered templates in context variables

Some controllers used the followifng pattern:
- render a data template into a context variable
- for partial (ajax) requests, return the contents of this variable
- for full-page requests, render the full page, which expands the value of
the context variable

Instead, avoid context variables let the controller simply render the full or partial page, and let
the full page template include the partial page.

Remove this context variable for templating and use render exclusively.
From templates, use %include instead of context variables.

This in line with the suggestions in the Pylons documentation:
http://pylons-webframework.readthedocs.org/en/latest/helpers.html#partial-updates-with-ajax

11 files changed with 18 insertions and 21 deletions:

kallithea/controllers/admin/admin.py

kallithea/controllers/followers.py

kallithea/controllers/forks.py

kallithea/controllers/journal.py

kallithea/controllers/pullrequests.py

kallithea/templates/admin/admin.html

kallithea/templates/followers/followers.html

kallithea/templates/forks/forks.html

kallithea/templates/journal/journal.html

kallithea/templates/journal/public_journal.html

kallithea/templates/pullrequests/pullrequest_show_all.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/admin.py

➞

Show inline comments

@@ @@ -138,11 +138,11 @@ class AdminController(BaseController): @@
         p = safe_int(request.GET.get('page', 1), 1)
         def url_generator(**kw):
             return url.current(filter=c.search_term, **kw)
         c.users_log = Page(users_log, page=p, items_per_page=10, url=url_generator)
         c.log_data = render('admin/admin_log.html')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.log_data
             return render('admin/admin_log.html')
         return render('admin/admin.html')

kallithea/controllers/followers.py

➞

Show inline comments

@@ @@ -50,12 +50,10 @@ class FollowersController(BaseRepoContro @@
         p = safe_int(request.GET.get('page', 1), 1)
         repo_id = c.db_repo.repo_id
         d = UserFollowing.get_repo_followers(repo_id)\
             .order_by(UserFollowing.follows_from)
         c.followers_pager = Page(d, page=p, items_per_page=20)
         c.followers_data = render('/followers/followers_data.html')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
-            return c.followers_data
+            return render('/followers/followers_data.html')
         return render('/followers/followers.html')

kallithea/controllers/forks.py

➞

Show inline comments

@@ @@ -120,16 +120,14 @@ class ForksController(BaseRepoController @@
                 'repository.read', 'repository.write', 'repository.admin'
             )(r.repo_name, 'get forks check'):
                 continue
             d.append(r)
         c.forks_pager = Page(d, page=p, items_per_page=20)
         c.forks_data = render('/forks/forks_data.html')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
-            return c.forks_data
+            return render('/forks/forks_data.html')
         return render('/forks/forks.html')
     @LoginRequired()
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')

kallithea/controllers/journal.py

➞

Show inline comments

@@ @@ -204,15 +204,14 @@ class JournalController(BaseController): @@
         def url_generator(**kw):
             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_data = render('journal/journal_data.html')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
-            return c.journal_data
+            return render('journal/journal_data.html')
         repos_list = Session().query(Repository)\
                      .filter(Repository.user_id ==
                              self.authuser.user_id)\
                      .order_by(func.lower(Repository.repo_name)).all()
@@ @@ -347,15 +346,15 @@ class JournalController(BaseController): @@
         journal = self._get_journal_data(c.following)
         c.journal_pager = Page(journal, page=p, items_per_page=20)
         c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
         c.journal_data = render('journal/journal_data.html')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.journal_data
             return render('journal/journal_data.html')
         return render('journal/public_journal.html')
     @LoginRequired(api_access=True)
     def public_journal_atom(self):
         """
         Produce an atom-1.0 feed via feedgenerator module

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -201,16 +201,14 @@ class PullrequestsController(BaseRepoCon @@
         c.pull_requests = PullRequestModel().get_all(repo_name, from_=c.from_, closed=c.closed)
         c.repo_name = repo_name
         p = safe_int(request.GET.get('page', 1), 1)
         c.pullrequests_pager = Page(c.pull_requests, page=p, items_per_page=10)
         c.pullrequest_data = render('/pullrequests/pullrequest_data.html')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
-            return c.pullrequest_data
+            return render('/pullrequests/pullrequest_data.html')
         return render('/pullrequests/pullrequest_show_all.html')
     @LoginRequired()
     def show_my(self): # my_account_my_pullrequests
         c.show_closed = request.GET.get('pr_show_closed')

kallithea/templates/admin/admin.html

➞

Show inline comments

@@ @@ -24,13 +24,13 @@ @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
         <div id="user_log">
-            ${c.log_data}
+            <%include file='admin_log.html'/>
         </div>
     </div>
 </div>
 <script>
 $(document).ready(function() {

kallithea/templates/followers/followers.html

➞

Show inline comments

@@ @@ -19,11 +19,11 @@ ${self.repo_context_bar('followers')} @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
         <div id="followers">
-            ${c.followers_data}
+            <%include file='followers_data.html'/>
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/forks/forks.html

➞

Show inline comments

@@ @@ -20,11 +20,11 @@ ${self.repo_context_bar('showforks')} @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
         <div id="forks">
-            ${c.forks_data}
+            <%include file='forks_data.html'/>
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/journal/journal.html

➞

Show inline comments

@@ @@ -33,13 +33,15 @@ @@
            </li>
            <li>
              <span><a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a></span>
            </li>
          </ul>
         </div>
         <div id="journal">${c.journal_data}</div>
         <div id="journal">
             <%include file='journal_data.html'/>
         </div>
     </div>
     <div class="box box-right">
         <!-- box / title -->
         <div class="title">
             <h5>

kallithea/templates/journal/public_journal.html

➞

Show inline comments

@@ @@ -25,10 +25,12 @@ @@
          <a href="${h.url('public_journal_atom')}"> <i class="icon-rss-squared" style="color: #fa9b39"></i></a>
        </span>
      </li>
      </ul>
   </div>
   <div id="journal">${c.journal_data}</div>
   <div id="journal">
     <%include file='journal_data.html'/>
   </div>
 </div>
 </%def>

kallithea/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -48,10 +48,10 @@ ${self.repo_context_bar('showpullrequest @@
         %else:
             ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))}
         %endif
         </div>
     </div>
-    ${c.pullrequest_data}
+    <%include file='pullrequest_data.html'/>
 </div>
 </%def>

0 comments (0 inline, 0 general)