kallithea Changeset - 174785aa5dc4

Changeset - 174785aa5dc4

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-08-05 23:59:41
marcin@python-works.com

fixed sorting of tags and branches. Fix made in vcs.

3 files changed with 12 insertions and 10 deletions:

pylons_app/controllers/branches.py

pylons_app/controllers/summary.py

pylons_app/controllers/tags.py

0 comments (0 inline, 0 general)

pylons_app/controllers/branches.py

➞

Show inline comments

 #!/usr/bin/env python
 # encoding: utf-8
 # branches controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
@@ @@ -19,15 +19,16 @@ @@
 # MA  02110-1301, USA.
 """
 Created on April 21, 2010
 branches controller for pylons
 @author: marcink
 """
-from pylons import tmpl_context as c, request
 from pylons import tmpl_context as c
 from pylons_app.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib.utils import OrderedDict
 from pylons_app.model.hg_model import HgModel
 import logging
 log = logging.getLogger(__name__)
 class BranchesController(BaseController):
@@ @@ -36,11 +37,11 @@ class BranchesController(BaseController) @@
     def __before__(self):
         super(BranchesController, self).__before__()
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
-        c.repo_branches = {}
+        c.repo_branches = OrderedDict()
         for name, hash_ in c.repo_info.branches.items():
             c.repo_branches[name] = c.repo_info.get_changeset(hash_)
         return render('branches/branches.html')

pylons_app/controllers/summary.py

➞

Show inline comments

@@ @@ -52,17 +52,17 @@ class SummaryController(BaseController): @@
         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 = {}
+        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 = {}
+        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')

pylons_app/controllers/tags.py

➞

Show inline comments

 #!/usr/bin/env python
 # encoding: utf-8
 # tags controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
@@ @@ -19,15 +19,16 @@ @@
 # MA  02110-1301, USA.
 """
 Created on April 21, 2010
 tags controller for pylons
 @author: marcink
 """
-from pylons import tmpl_context as c, request
 from pylons import tmpl_context as c
 from pylons_app.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib.utils import OrderedDict
 from pylons_app.model.hg_model import HgModel
 import logging
 log = logging.getLogger(__name__)
 class TagsController(BaseController):
@@ @@ -36,11 +37,11 @@ class TagsController(BaseController): @@
     def __before__(self):
         super(TagsController, self).__before__()
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
         c.repo_tags = {}
         for name, hash in c.repo_info.tags.items():
             c.repo_tags[name] = c.repo_info.get_changeset(hash)
         c.repo_tags = OrderedDict()
         for name, hash_ in c.repo_info.tags.items():
             c.repo_tags[name] = c.repo_info.get_changeset(hash_)
         return render('tags/tags.html')

0 comments (0 inline, 0 general)