# HG changeset patch # User Marcin Kuzminski # Date 1316650082 -10800 # Node ID a39c0e5fca898a1eecf0c3f66f412db82d3f5fbd # Parent 605707b50d7c54198c06555e40e7194743a4b921 removed obsolete sort code diff -r 605707b50d7c -r a39c0e5fca89 rhodecode/controllers/admin/repos_groups.py --- a/rhodecode/controllers/admin/repos_groups.py Thu Sep 22 03:06:08 2011 +0300 +++ b/rhodecode/controllers/admin/repos_groups.py Thu Sep 22 03:08:02 2011 +0300 @@ -165,11 +165,10 @@ category='error') return redirect(url('repos_groups')) - try: repos_group_model.delete(id) h.flash(_('removed repos group %s' % gr.group_name), category='success') - #TODO: in futureaction_logger(, '', '', '', self.sa) + #TODO: in future action_logger(, '', '', '', self.sa) except Exception: log.error(traceback.format_exc()) h.flash(_('error occurred during deletion of repos group %s' % gr.group_name), @@ -181,27 +180,13 @@ """GET /repos_groups/id: Show a specific item""" # url('repos_group', id=ID) - gr = c.group = Group.get(id) + c.group = Group.get(id) if c.group: c.group_repos = c.group.repositories.all() else: return redirect(url('home')) - - sortables = ['name', 'description', 'last_change', 'tip', 'owner'] - current_sort = request.GET.get('sort', 'name') - current_sort_slug = current_sort.replace('-', '') - - if current_sort_slug not in sortables: - c.sort_by = 'name' - current_sort_slug = c.sort_by - else: - c.sort_by = current_sort - c.sort_slug = current_sort_slug - - sort_key = current_sort_slug + '_sort' - #overwrite our cached list with current filter gr_filter = c.group_repos c.cached_repo_list = self.scm_model.get_repos(all_repos=gr_filter) @@ -220,13 +205,13 @@ """GET /repos_groups/id/edit: Form to edit an existing item""" # url('edit_repos_group', id=ID) - id = int(id) + id_ = int(id) - c.repos_group = Group.get(id) - defaults = self.__load_data(id) + c.repos_group = Group.get(id_) + defaults = self.__load_data(id_) # we need to exclude this group from the group list for editing - c.repo_groups = filter(lambda x:x[0] != id, c.repo_groups) + c.repo_groups = filter(lambda x:x[0] != id_, c.repo_groups) return htmlfill.render( render('admin/repos_groups/repos_groups_edit.html'), diff -r 605707b50d7c -r a39c0e5fca89 rhodecode/controllers/home.py --- a/rhodecode/controllers/home.py Thu Sep 22 03:06:08 2011 +0300 +++ b/rhodecode/controllers/home.py Thu Sep 22 03:08:02 2011 +0300 @@ -43,20 +43,8 @@ super(HomeController, self).__before__() def index(self): - sortables = ['name', 'description', 'last_change', 'tip', 'owner'] - current_sort = request.GET.get('sort', 'name') - current_sort_slug = current_sort.replace('-', '') - if current_sort_slug not in sortables: - c.sort_by = 'name' - current_sort_slug = c.sort_by - else: - c.sort_by = current_sort - c.sort_slug = current_sort_slug - - sort_key = current_sort_slug + '_sort' - - c.repos_list = self.scm_model.get_repos(sort_key=sort_key) + c.repos_list = self.scm_model.get_repos() c.groups = Group.query().filter(Group.group_parent_id == None).all() diff -r 605707b50d7c -r a39c0e5fca89 rhodecode/templates/index_base.html --- a/rhodecode/templates/index_base.html Thu Sep 22 03:06:08 2011 +0300 +++ b/rhodecode/templates/index_base.html Thu Sep 22 03:08:02 2011 +0300 @@ -1,18 +1,4 @@ <%page args="parent" /> - <%def name="get_sort(name)"> - <%name_slug = name.lower().replace(' ','_') %> - - %if name_slug == c.sort_slug: - %if c.sort_by.startswith('-'): - ${name}↑ - %else: - ${name}↓ - %endif: - %else: - ${name} - %endif - -
@@ -67,11 +53,11 @@ - ${get_sort(_('Name'))} - ${get_sort(_('Description'))} - ${get_sort(_('Last change'))} - ${get_sort(_('Tip'))} - ${get_sort(_('Owner'))} + ${_('Name')} + ${_('Description')} + ${_('Last change')} + ${_('Tip')} + ${_('Owner')} ${_('RSS')} ${_('Atom')} @@ -145,10 +131,7 @@ %if repo['rev']>=0: - ${h.link_to('r%s:%s' % (repo['rev'],h.short_id(repo['tip'])), - h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']), - class_="tooltip", - title=h.tooltip('%s\n%s' % (repo['author'],repo['last_msg'])))} + ${'r%s:%s' % (repo['rev'],h.short_id(repo['tip']))} %else: ${_('No changesets yet')} %endif @@ -170,7 +153,6 @@ %endfor -