Mercurial > kallithea
changeset 687:b9442a8b5e02 beta
fixed admin settings form resubmition bug.
removed obsolete whoosh index location. Some small templates fixes
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 14 Nov 2010 01:30:02 +0100 |
| parents | ff6a8196ebfe |
| children | 8acbfa837180 |
| files | rhodecode/controllers/admin/settings.py rhodecode/lib/indexers/__init__.py rhodecode/templates/changelog/changelog.html |
| diffstat | 3 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/settings.py Sat Nov 13 02:50:32 2010 +0100 +++ b/rhodecode/controllers/admin/settings.py Sun Nov 14 01:30:02 2010 +0100 @@ -289,10 +289,13 @@ except formencode.Invalid, errors: c.user = user_model.get(c.rhodecode_user.user_id, cache=False) - c.user_repos = [] - for repo in c.cached_repo_list.values(): - if repo.dbrepo.user.username == c.user.username: - c.user_repos.append(repo) + c.user = UserModel(self.sa).get(c.rhodecode_user.user_id, cache=False) + all_repos = self.sa.query(Repository)\ + .filter(Repository.user_id == c.user.user_id)\ + .order_by(func.lower(Repository.repo_name))\ + .all() + c.user_repos = HgModel().get_repos(all_repos) + return htmlfill.render( render('admin/users/user_edit_my_account.html'), defaults=errors.value,
--- a/rhodecode/lib/indexers/__init__.py Sat Nov 13 02:50:32 2010 +0100 +++ b/rhodecode/lib/indexers/__init__.py Sun Nov 14 01:30:02 2010 +0100 @@ -19,10 +19,6 @@ import traceback - -#LOCATION WE KEEP THE INDEX -IDX_LOCATION = jn(dn(dn(dn(dn(os.path.abspath(__file__))))), 'data', 'index') - #EXTENSIONS WE WANT TO INDEX CONTENT OFF INDEX_EXTENSIONS = ['action', 'adp', 'ashx', 'asmx', 'aspx', 'asx', 'axd', 'c', 'cfg', 'cfm', 'cpp', 'cs', 'css', 'diff', 'do', 'el', 'erl',
--- a/rhodecode/templates/changelog/changelog.html Sat Nov 13 02:50:32 2010 +0100 +++ b/rhodecode/templates/changelog/changelog.html Sun Nov 14 01:30:02 2010 +0100 @@ -58,12 +58,9 @@ </div> <div class="right"> <div class="changes"> - <span class="removed" title="${_('removed')}: ${' | '.join([x.name for x in cs.removed])}"> - ${len(cs.removed)}</span> - <span class="changed" title="${_('changed')}: ${' | '.join([x.name for x in cs.changed])}"> - ${len(cs.changed)}</span> - <span class="added" title="${_('added')}: ${' | '.join([x.name for x in cs.added])}"> - ${len(cs.added)}</span> + <span class="removed" title="${_('removed')}: ${' | '.join([x.name for x in cs.removed])}">${len(cs.removed)}</span> + <span class="changed" title="${_('changed')}: ${' | '.join([x.name for x in cs.changed])}">${len(cs.changed)}</span> + <span class="added" title="${_('added')}: ${' | '.join([x.name for x in cs.added])}">${len(cs.added)}</span> </div> %if len(cs.parents)>1: <div class="merge">