2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

save changeset pk in session instead of session id in changeset

Browse source
This commit is contained in:
Laura Klünder 2017-07-04 22:14:43 +02:00
parent b8be4a8105
commit 755421706c
4 changed files with 48 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/c3nav/editor/views/changes.py
View file

@ -19,7 +19,9 @@ from c3nav.mapdata.models.locations import LocationRedirect, LocationSlug
@sidebar_view
def changeset_detail(request, pk):
changeset = request.changeset
editing = True
if str(pk) != str(request.changeset.pk):
editing = False
changeset = get_object_or_404(ChangeSet.qs_for_request(request), pk=pk)
if not changeset.can_see(request):
@ -27,6 +29,7 @@ def changeset_detail(request, pk):
can_edit = changeset.can_edit(request)
can_delete = changeset.can_delete(request)
editing = editing and can_edit
if request.method == 'POST':
restore = request.POST.get('restore')
@ -123,7 +126,7 @@ def changeset_detail(request, pk):
obj_still_exists = pk not in changeset.deleted_existing.get(obj.__class__, ())
edit_url = None
if obj_still_exists and can_edit and not isinstance(obj, LocationRedirect):
if obj_still_exists and editing and not isinstance(obj, LocationRedirect):
reverse_kwargs = {'pk': obj.pk}
if hasattr(obj, 'level_id'):
reverse_kwargs['level'] = obj.level_id

3
src/c3nav/editor/views/login.py
View file

@ -18,10 +18,7 @@ def login_view(request):
login(request, form.user_cache)
if request.changeset.pk is not None:
if request.session.session_key is None:
request.session.save()
request.changeset.author = form.user_cache
request.changeset.session_key = request.session.session_key
request.changeset.save()
return redirect(redirect_path)
else: