removed obsolete sort code

rhodecode/controllers/admin/repos_groups.py

@@ -1,238 +1,223
 import logging
 import traceback
 import formencode
 
 from formencode import htmlfill
 from operator import itemgetter
 
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import Group
 from rhodecode.model.repos_group import ReposGroupModel
 from rhodecode.model.forms import ReposGroupForm
 
 log = logging.getLogger(__name__)
 
 
 class ReposGroupsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
     #     map.resource('repos_group', 'repos_groups')
 
     @LoginRequired()
     def __before__(self):
         super(ReposGroupsController, self).__before__()
 
     def __load_defaults(self):
 
         c.repo_groups = [('', '')]
         parents_link = lambda k: h.literal('»'.join(
                                     map(lambda k: k.group_name,
                                         k.parents + [k])
                                     )
                                 )
 
         c.repo_groups.extend([(x.group_id, parents_link(x)) for \
                                             x in self.sa.query(Group).all()])
 
         c.repo_groups = sorted(c.repo_groups,
                                key=lambda t: t[1].split('»')[0])
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
 
     def __load_data(self, group_id):
         """
         Load defaults settings for edit, and update
 
         :param group_id:
         """
         self.__load_defaults()
 
         repo_group = Group.get(group_id)
 
         data = repo_group.get_dict()
 
         return data
 
     @HasPermissionAnyDecorator('hg.admin')
     def index(self, format='html'):
         """GET /repos_groups: All items in the collection"""
         # url('repos_groups')
 
         sk = lambda g:g.parents[0].group_name if g.parents else g.group_name
         c.groups = sorted(Group.query().all(), key=sk)
         return render('admin/repos_groups/repos_groups_show.html')
 
     @HasPermissionAnyDecorator('hg.admin')
     def create(self):
         """POST /repos_groups: Create a new item"""
         # url('repos_groups')
         self.__load_defaults()
         repos_group_model = ReposGroupModel()
         repos_group_form = ReposGroupForm(available_groups=
                                           c.repo_groups_choices)()
         try:
             form_result = repos_group_form.to_python(dict(request.POST))
             repos_group_model.create(form_result)
             h.flash(_('created repos group %s') \
                     % form_result['group_name'], category='success')
             #TODO: in futureaction_logger(, '', '', '', self.sa)
         except formencode.Invalid, errors:
 
             return htmlfill.render(
                 render('admin/repos_groups/repos_groups_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during creation of repos group %s') \
                     % request.POST.get('group_name'), category='error')
 
         return redirect(url('repos_groups'))
 
 
     @HasPermissionAnyDecorator('hg.admin')
     def new(self, format='html'):
         """GET /repos_groups/new: Form to create a new item"""
         # url('new_repos_group')
         self.__load_defaults()
         return render('admin/repos_groups/repos_groups_add.html')
 
     @HasPermissionAnyDecorator('hg.admin')
     def update(self, id):
         """PUT /repos_groups/id: Update an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('repos_group', id=ID),
         #           method='put')
         # url('repos_group', id=ID)
 
         self.__load_defaults()
         c.repos_group = Group.get(id)
 
         repos_group_model = ReposGroupModel()
         repos_group_form = ReposGroupForm(edit=True,
                                           old_data=c.repos_group.get_dict(),
                                           available_groups=
                                             c.repo_groups_choices)()
         try:
             form_result = repos_group_form.to_python(dict(request.POST))
             repos_group_model.update(id, form_result)
             h.flash(_('updated repos group %s') \
                     % form_result['group_name'], category='success')
             #TODO: in futureaction_logger(, '', '', '', self.sa)
         except formencode.Invalid, errors:
 
             return htmlfill.render(
                 render('admin/repos_groups/repos_groups_edit.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during update of repos group %s') \
                     % request.POST.get('group_name'), category='error')
 
         return redirect(url('repos_groups'))
 
 
     @HasPermissionAnyDecorator('hg.admin')
     def delete(self, id):
         """DELETE /repos_groups/id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('repos_group', id=ID),
         #           method='delete')
         # url('repos_group', id=ID)
 
         repos_group_model = ReposGroupModel()
         gr = Group.get(id)
         repos = gr.repositories.all()
         if repos:
             h.flash(_('This group contains %s repositores and cannot be '
                       'deleted' % len(repos)),
                     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),
                     category='error')
 
         return redirect(url('repos_groups'))
 
     def show(self, id, format='html'):
         """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)
 
         c.repos_list = c.cached_repo_list
 
         c.repo_cnt = 0
 
         c.groups = self.sa.query(Group).order_by(Group.group_name)\
             .filter(Group.group_parent_id == id).all()
 
         return render('admin/repos_groups/repos_groups.html')
 
     @HasPermissionAnyDecorator('hg.admin')
     def edit(self, id, format='html'):
         """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'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
 

rhodecode/controllers/home.py

@@ -1,72 +1,60
 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.home
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Home controller for Rhodecode
 
     :created_on: Feb 18, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # 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, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 from operator import itemgetter
 
 from pylons import tmpl_context as c, request
 from paste.httpexceptions import HTTPBadRequest
 
 from rhodecode.lib.auth import LoginRequired
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import Group, Repository
 
 log = logging.getLogger(__name__)
 
 
 class HomeController(BaseController):
 
     @LoginRequired()
     def __before__(self):
         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()
 
         return render('/index.html')
 
     def repo_switcher(self):
         if request.is_xhr:
             all_repos = Repository.query().order_by(Repository.repo_name).all()
             c.repos_list = self.scm_model.get_repos(all_repos,
                                                     sort_key='name_sort')
             return render('/repo_switcher_list.html')
         else:
             return HTTPBadRequest()

rhodecode/templates/index_base.html

@@ -1,244 +1,226
 <%page args="parent" /> 
-    <%def name="get_sort(name)">
-        <%name_slug = name.lower().replace(' ','_') %>
-        
-        %if name_slug == c.sort_slug:
-          %if c.sort_by.startswith('-'):
-            <a href="?sort=${name_slug}">${name}&uarr;</a>
-          %else:
-            <a href="?sort=-${name_slug}">${name}&darr;</a>
-          %endif:
-        %else:
-            <a href="?sort=${name_slug}">${name}</a>
-        %endif
-    </%def>
-    
     <div class="box">
         <!-- box / title -->
         <div class="title">
             <h5>
             <input class="top-right-rounded-corner top-left-rounded-corner bottom-left-rounded-corner bottom-right-rounded-corner" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
             ${parent.breadcrumbs()} <span id="repo_count"></span> ${_('repositories')} 
             </h5>
             %if c.rhodecode_user.username != 'default':
                 %if h.HasPermissionAny('hg.admin','hg.create.repository')():
                 <ul class="links">
                   <li>
                     <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'))}</span>
                   </li>          
                 </ul>           
                 %endif
             %endif
         </div>
         <!-- end box / title -->
         <div class="table">
            % if c.groups:
             <table>
                 <thead>
                     <tr>
                         <th class="left"><a href="#">${_('Group name')}</a></th>
                         <th class="left"><a href="#">${_('Description')}</a></th>
                         ##<th class="left"><a href="#">${_('Number of repositories')}</a></th>
                     </tr>
                 </thead>
                 
                 ## REPO GROUPS
                 
                 % for gr in c.groups:
                   <tr>
                       <td>
                           <div style="white-space: nowrap">
                           <img class="icon" alt="${_('Repositories group')}" src="${h.url('/images/icons/database_link.png')}"/>
                           ${h.link_to(gr.group_name,url('repos_group',id=gr.group_id))}
                           </div>
                       </td>
                       <td>${gr.group_description}</td>
                       ##<td><b>${gr.repositories.count()}</b></td>
                   </tr>
                 % endfor
                 
             </table>
             <div style="height: 20px"></div>
             % endif
             <div id="welcome" style="display:none;text-align:center">
                 <h1><a href="${h.url('home')}">${c.rhodecode_name} ${c.rhodecode_version}</a></h1>
             </div>
             <table id="repos_list">
             <thead>
                 <tr>
                     <th class="left"></th>
-                    <th class="left">${get_sort(_('Name'))}</th>
-                    <th class="left">${get_sort(_('Description'))}</th>
-                    <th class="left">${get_sort(_('Last change'))}</th>
-                    <th class="left">${get_sort(_('Tip'))}</th>
-                    <th class="left">${get_sort(_('Owner'))}</th>
+                    <th class="left">${_('Name')}</th>
+                    <th class="left">${_('Description')}</th>
+                    <th class="left">${_('Last change')}</th>
+                    <th class="left">${_('Tip')}</th>
+                    <th class="left">${_('Owner')}</th>
                     <th class="left">${_('RSS')}</th>
                     <th class="left">${_('Atom')}</th>
                 </tr>
             </thead>
             <tbody>
             %for cnt,repo in enumerate(c.repos_list):
                 <tr class="parity${cnt%2}">
                     <td class="quick_repo_menu">
                     <ul class="menu_items hidden">
                       <li>
                          <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=repo['name'])}">
                          <span class="icon">
                              <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" />
                          </span>
                          <span>${_('Summary')}</span>                 
                          </a>             
                       </li>
                       <li>
                          <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=repo['name'])}">
                          <span class="icon">
                              <img src="${h.url('/images/icons/time.png')}" alt="${_('Changelog')}" />
                          </span>
                          <span>${_('Changelog')}</span>                 
                          </a>             
                       </li>
                       <li>
                          <a title="${_('Files')}" href="${h.url('files_home',repo_name=repo['name'])}">
                          <span class="icon">
                              <img src="${h.url('/images/icons/file.png')}" alt="${_('Files')}" />
                          </span>
                          <span>${_('Files')}</span>                 
                          </a>             
                       </li>                                    
                     </ul>
                     </td>
                     <td>
                     ## TYPE OF REPO
                     <div style="white-space: nowrap">
                      %if repo['dbrepo']['repo_type'] =='hg':
                        <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>
                      %elif repo['dbrepo']['repo_type'] =='git':
                        <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>
                      %endif 
                     
                      ##PRIVATE/PUBLIC
                      %if repo['dbrepo']['private']:
                         <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/>
                      %else:
                         <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
                      %endif
                     
                     ##NAME   
                     ${h.link_to(repo['name'],
                         h.url('summary_home',repo_name=repo['name']),class_="repo_name")}
                     %if repo['dbrepo_fork']:
                         <a href="${h.url('summary_home',repo_name=repo['dbrepo_fork']['repo_name'])}">
                         <img class="icon" alt="${_('fork')}"
                         title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}" 
                         src="${h.url('/images/icons/arrow_divide.png')}"/></a>
                     %endif
                     </div>
                     </td>
                     ##DESCRIPTION
                     <td><span class="tooltip" title="${h.tooltip(repo['description'])}">
                        ${h.truncate(repo['description'],60)}</span>
                     </td>
                     ##LAST CHANGE
                     <td>
                       <span class="tooltip" title="${repo['last_change']}">
                       ${h.age(repo['last_change'])}</span>
                     </td>
                     <td>
                         %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'])))}
+                        <a title="${h.tooltip('%s\n%s' % (repo['author'],repo['last_msg']))}" class="tooltip" href="${h.url('changeset_home',repo_name=repo['name'],revision=repo['tip'])}">${'r%s:%s' % (repo['rev'],h.short_id(repo['tip']))}</a>
                         %else:
                             ${_('No changesets yet')}
                         %endif    
                     </td>
                     <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
                     <td>
                       %if c.rhodecode_user.username != 'default':
                         <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a>
                       %else:
                         <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a>
                       %endif:                       
                     </td>        
                     <td>
                       %if c.rhodecode_user.username != 'default':
                         <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a>
                       %else:
                         <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'])}"></a>
                       %endif:
                     </td>
                 </tr>
             %endfor
-            
             </tbody>
             </table>
             </div>
     </div>
     
     
     <script type="text/javascript">
      var D = YAHOO.util.Dom;
      var E = YAHOO.util.Event;
      var S = YAHOO.util.Selector;
      
      var q_filter = D.get('q_filter');
      var F = YAHOO.namespace('q_filter'); 
      
      E.on(q_filter,'click',function(){
         q_filter.value = '';
      });
 
      F.filterTimeout = null;
      
      function set_count(count){
     
     	 if(count == 0){
     		 YUD.setStyle('repos_list','display','none');
     		 YUD.setStyle('welcome','display','');
     	 }
     	 else{
     		 YUD.setStyle('repos_list','display','');
     		 YUD.setStyle('welcome','display','none');
     	 }
     	 YUD.get('repo_count').innerHTML = count;
     	 
      }
      
      
      //set initial count for repos
      var nodes = S.query('div.table tr td div a.repo_name');
      
      set_count(nodes.length)
      F.updateFilter  = function() { 
         // Reset timeout 
         F.filterTimeout = null;
         
         var obsolete = [];
         nodes = S.query('div.table tr td div a.repo_name');
         var req = q_filter.value.toLowerCase();
         for (n in nodes){
             D.setStyle(nodes[n].parentNode.parentNode.parentNode,'display','')
         }
         if (req){
             for (n in nodes){
                 if (nodes[n].innerHTML.toLowerCase().indexOf(req) == -1) {
                     obsolete.push(nodes[n]); 
                 }
             }
             if(obsolete){
                 for (n in obsolete){
                     D.setStyle(obsolete[n].parentNode.parentNode.parentNode,'display','none');
                 }
             }
         }
         // set new count into dashboard
         set_count(nodes.length - obsolete.length)
      }
      
      E.on(q_filter,'keyup',function(e){
          clearTimeout(F.filterTimeout); 
          F.filterTimeout = setTimeout(F.updateFilter,600); 
      });
      
     </script>