inpt/ponytracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix edit/add project checks

Browse source
This commit is contained in:
Élie Bouttier 2014-09-03 21:39:36 -07:00
parent 4b477f8492
commit 483d0c3bdf
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tracker/views.py
View file

@ -63,9 +63,13 @@ def project_add(request):
if request.method == 'POST' and form.is_valid(): if request.method == 'POST' and form.is_valid():
name = form.cleaned_data['name'] name = form.cleaned_data['name']
display_name = form.cleaned_data['display_name']
if name in settings.RESERVED_PROJECT_URLS: if name in settings.RESERVED_PROJECT_URLS:
form._errors['name'] = ['Sorry, this URL is reserved ' form._errors['name'] = ['Sorry, this URL is reserved '
'and can not be used.'] 'and can not be used.']
elif Project.objects.filter(display_name__iexact=display_name).exists():
form._errors['display_name'] = ['There is already a project '
'with a similar name.']
else: else:
project = form.save() project = form.save()
messages.success(request, 'Project added successfully.') messages.success(request, 'Project added successfully.')
@ -89,8 +93,12 @@ def project_edit(request, project):
if request.method == 'POST' and form.is_valid(): if request.method == 'POST' and form.is_valid():
name = form.cleaned_data['display_name'] name = form.cleaned_data['name']
if Project.objects.filter(display_name__iexact=name) \ display_name = form.cleaned_data['display_name']
if name in settings.RESERVED_PROJECT_URLS:
form._errors['name'] = ['Sorry, this URL is reserved '
'and can not be used.']
elif Project.objects.filter(display_name__iexact=display_name) \
.exclude(pk=project.pk).exists(): .exclude(pk=project.pk).exists():
form._errors['display_name'] = ['There is already a project ' form._errors['display_name'] = ['There is already a project '
'with a similar name.'] 'with a similar name.']