Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions chris_backend/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -581,12 +581,19 @@ def __str__(self):

def save(self, *args, **kwargs):
"""
Overriden to ensure file paths never start or end with slashes.
Overriden to ensure file paths never start or end with slashes. Also, to delete
a leftover file in storage if any error happens when saving the file.
"""
path = self.fname.name
if path.startswith('/') or path.endswith('/'):
raise ValueError('Paths starting or ending with slashes are not allowed.')
super(ChrisFile, self).save(*args, **kwargs)
try:
super(ChrisFile, self).save(*args, **kwargs)
except Exception:
storage_manager = connect_storage(settings)
if storage_manager.obj_exists(path):
storage_manager.delete_obj(path)
raise

def move(self, new_path):
"""
Expand Down
1 change: 1 addition & 0 deletions chris_backend/users/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
validators=[UniqueValidator(
queryset=User.objects.all())])
password = serializers.CharField(min_length=8, max_length=100, write_only=True)
is_staff = serializers.ReadOnlyField()
groups = serializers.HyperlinkedIdentityField(view_name='user-group-list')

class Meta:
Expand Down
Loading