8000 Resolve conflicts not use locals · lcppcl/code@5cb0e3f · GitHub
[go: up one dir, main page]

Skip to content

Commit 5cb0e3f

Browse files
committed
Resolve conflicts not use locals
2 parents 5cec0f0 + eb05a81 commit 5cb0e3f

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

vilya/views/projects/__init__.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ def __call__(request):
1313

1414

1515
def _q_index(request):
16+
context = {}
1617
current_user = request.user
1718
if current_user and request.method == "POST":
1819
name = request.get_form_var('name')
@@ -22,15 +23,20 @@ def _q_index(request):
2223
owner_id=current_user.id,
2324
creator_id=current_user.id)
2425
if p:
25-
return request.redirect('projects/%s' % p.name)
26+
return request.redirect('%s' % p.repo_name)
2627
has_proj = Project.get_by_name_and_owner(name, current_user.id)
27-
error = 'Create Failure. Please contact the administrator!'
28+
default_error = 'Create Failure. Please contact the administrator!'
2829
if has_proj is not None:
29-
error = 'Project has exists, Please confirm!'
30-
return st('/errors/common.html', **locals())
30+
context['error'] = 'Project has exists, Please confirm!'
31+
else:
32+
context['error'] = default_error
< 7462 code>33+
context['current_user'] = current_user
34+
return st('/errors/common.html', **context)
3135

3236
projects = Project.gets_by()
33-
return st('projects/index.html', **locals())
37+
context['projects'] = projects
38+
context['current_user'] = current_user
39+
return st('projects/index.html', **context)
3440

3541

3642
def _q_lookup(request, part):

0 commit comments

Comments
 (0)
0