Changeset - b9442a8b5e02
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 15 years ago 2010-11-14 01:30:02
marcin@python-works.com
fixed admin settings form resubmition bug.
removed obsolete whoosh index location. Some small templates fixes
3 files changed with 10 insertions and 14 deletions:
0 comments (0 inline, 0 general)
rhodecode/controllers/admin/settings.py
Show inline comments
 
@@ -289,10 +289,13 @@ class SettingsController(BaseController)
 

	
 
        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,
rhodecode/lib/indexers/__init__.py
Show inline comments
 
@@ -19,10 +19,6 @@ from whoosh.highlight import highlight, 
 

	
 
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',
rhodecode/templates/changelog/changelog.html
Show inline comments
 
@@ -58,12 +58,9 @@ ${c.repo_name} ${_('Changelog')} - ${c.r
 
						</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">
0 comments (0 inline, 0 general)