better error message when trying to edit objects in a locked changeset
This commit is contained in:
parent
eed1856353
commit
bfd75f9ee3
1 changed files with 4 additions and 4 deletions
|
@ -138,7 +138,7 @@ def edit(request, pk=None, model=None, level=None, space=None, on_top_of=None, e
|
||||||
Level = request.changeset.wrap_model('Level')
|
Level = request.changeset.wrap_model('Level')
|
||||||
Space = request.changeset.wrap_model('Space')
|
Space = request.changeset.wrap_model('Space')
|
||||||
|
|
||||||
can_edit = request.changeset.can_edit(request)
|
can_edit_changeset = request.changeset.can_edit(request)
|
||||||
|
|
||||||
obj = None
|
obj = None
|
||||||
edit_utils = DefaultEditUtils(request)
|
edit_utils = DefaultEditUtils(request)
|
||||||
|
@ -188,7 +188,7 @@ def edit(request, pk=None, model=None, level=None, space=None, on_top_of=None, e
|
||||||
'pk': pk,
|
'pk': pk,
|
||||||
'model_name': model.__name__.lower(),
|
'model_name': model.__name__.lower(),
|
||||||
'model_title': model._meta.verbose_name,
|
'model_title': model._meta.verbose_name,
|
||||||
'can_edit': can_edit,
|
'can_edit': can_edit_changeset,
|
||||||
'new': new,
|
'new': new,
|
||||||
'title': obj.title if obj else None,
|
'title': obj.title if obj else None,
|
||||||
'geometry_url': geometry_url,
|
'geometry_url': geometry_url,
|
||||||
|
@ -289,9 +289,9 @@ def edit(request, pk=None, model=None, level=None, space=None, on_top_of=None, e
|
||||||
redirect_to=request.path, status_code=409,
|
redirect_to=request.path, status_code=409,
|
||||||
)
|
)
|
||||||
|
|
||||||
if not can_edit:
|
if not can_edit_changeset:
|
||||||
return APIHybridMessageRedirectResponse(
|
return APIHybridMessageRedirectResponse(
|
||||||
level='error', message=_('You can not edit this object.'),
|
level='error', message=_('You can not edit changes on this changeset.'),
|
||||||
redirect_to=request.path, status_code=403,
|
redirect_to=request.path, status_code=403,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue