Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jkmarx/group name duplicate error #1573

Merged
merged 9 commits into from
Jan 17, 2017
Merged

Jkmarx/group name duplicate error #1573

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d0ec974
Error handling in the group api.
jkmarx Jan 4, 2017
5a983ea
Prevent duplicate group names.
jkmarx Jan 4, 2017
e388af9
Fix name duplication check.
jkmarx Jan 4, 2017
c9c6d68
Double quote strings.
jkmarx Jan 4, 2017
168669c
Remove duplicate error since db returns integrityError.
jkmarx Jan 5, 2017
416262e
Merge branch 'develop' of https://github.com/parklab/refinery-platfor…
jkmarx Jan 5, 2017
3445dc6
Create and call clean method for stripping white spaces.
jkmarx Jan 5, 2017
58b434f
Utilize full_clean for param validation.
jkmarx Jan 6, 2017
1bec1ce
Remove unnessary methods due to using full_clean.
jkmarx Jan 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion refinery/core/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
from django.template import loader, Context
from django.core.cache import cache
from django.core.signing import Signer
from django.db import IntegrityError
from django.forms import ValidationError
from guardian.shortcuts import get_objects_for_user, get_objects_for_group
from guardian.models import GroupObjectPermission
from tastypie import fields
Expand Down Expand Up @@ -2018,7 +2020,12 @@ def obj_create(self, bundle, **kwargs):
user = bundle.request.user
data = json.loads(bundle.request.body)
new_ext_group = ExtendedGroup(name=data['name'])
new_ext_group.save()
try:
new_ext_group.save()
except (ValidationError, IntegrityError) as e:
raise ImmediateHttpResponse(HttpBadRequest(
'Invalid group creation request: %s.' % e
))
new_ext_group.user_set.add(user)
new_ext_group.manager_group.user_set.add(user)
return bundle
Expand Down
2 changes: 1 addition & 1 deletion refinery/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,7 +1875,7 @@ def get_managed_group(self):
def save(self, *args, **kwargs):
Copy link
Member

@hackdna hackdna Jan 5, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the preferred way to validate model fields is via full_clean() and clean() model methods instead of overriding save(): https://docs.djangoproject.com/en/1.7/ref/models/instances/#django.db.models.Model.clean

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, the group name cannot be blank already: name = models.CharField(_('name'), max_length=80, unique=True), so no additional checking for that is necessary. It might be a good idea to strip whitespace characters though.

if len(self.name) == 0:
logger.error("Group name cannot be empty.")
return
raise ValidationError('Group name cannot be empty')
else:
super(ExtendedGroup, self).save(*args, **kwargs)

Expand Down