##// END OF EJS Templates
fixed admin settings form resubmition bug....
marcink -
r687:b9442a8b beta
parent child Browse files
Show More
@@ -289,10 +289,13 b' class SettingsController(BaseController)'
289
289
290 except formencode.Invalid, errors:
290 except formencode.Invalid, errors:
291 c.user = user_model.get(c.rhodecode_user.user_id, cache=False)
291 c.user = user_model.get(c.rhodecode_user.user_id, cache=False)
292 c.user_repos = []
292 c.user = UserModel(self.sa).get(c.rhodecode_user.user_id, cache=False)
293 for repo in c.cached_repo_list.values():
293 all_repos = self.sa.query(Repository)\
294 if repo.dbrepo.user.username == c.user.username:
294 .filter(Repository.user_id == c.user.user_id)\
295 c.user_repos.append(repo)
295 .order_by(func.lower(Repository.repo_name))\
296 .all()
297 c.user_repos = HgModel().get_repos(all_repos)
298
296 return htmlfill.render(
299 return htmlfill.render(
297 render('admin/users/user_edit_my_account.html'),
300 render('admin/users/user_edit_my_account.html'),
298 defaults=errors.value,
301 defaults=errors.value,
@@ -19,10 +19,6 b' from whoosh.highlight import highlight, '
19
19
20 import traceback
20 import traceback
21
21
22
23 #LOCATION WE KEEP THE INDEX
24 IDX_LOCATION = jn(dn(dn(dn(dn(os.path.abspath(__file__))))), 'data', 'index')
25
26 #EXTENSIONS WE WANT TO INDEX CONTENT OFF
22 #EXTENSIONS WE WANT TO INDEX CONTENT OFF
27 INDEX_EXTENSIONS = ['action', 'adp', 'ashx', 'asmx', 'aspx', 'asx', 'axd', 'c',
23 INDEX_EXTENSIONS = ['action', 'adp', 'ashx', 'asmx', 'aspx', 'asx', 'axd', 'c',
28 'cfg', 'cfm', 'cpp', 'cs', 'css', 'diff', 'do', 'el', 'erl',
24 'cfg', 'cfm', 'cpp', 'cs', 'css', 'diff', 'do', 'el', 'erl',
@@ -58,12 +58,9 b''
58 </div>
58 </div>
59 <div class="right">
59 <div class="right">
60 <div class="changes">
60 <div class="changes">
61 <span class="removed" title="${_('removed')}: ${' | '.join([x.name for x in cs.removed])}">
61 <span class="removed" title="${_('removed')}: ${' | '.join([x.name for x in cs.removed])}">${len(cs.removed)}</span>
62 ${len(cs.removed)}</span>
62 <span class="changed" title="${_('changed')}: ${' | '.join([x.name for x in cs.changed])}">${len(cs.changed)}</span>
63 <span class="changed" title="${_('changed')}: ${' | '.join([x.name for x in cs.changed])}">
63 <span class="added" title="${_('added')}: ${' | '.join([x.name for x in cs.added])}">${len(cs.added)}</span>
64 ${len(cs.changed)}</span>
65 <span class="added" title="${_('added')}: ${' | '.join([x.name for x in cs.added])}">
66 ${len(cs.added)}</span>
67 </div>
64 </div>
68 %if len(cs.parents)>1:
65 %if len(cs.parents)>1:
69 <div class="merge">
66 <div class="merge">
General Comments 0
You need to be logged in to leave comments. Login now