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

Keep draft 'reason' when editing own draft #490

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Keep draft 'reason' when editing own draft #490

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions games/views/pages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ def edit_installer(request, slug):
revision_id = None

draft_data = None
selected_version = None
versions = Version.objects.get_for_object(installer)

# Reset reason when the installer is edited.
Expand All @@ -303,20 +304,25 @@ def edit_installer(request, slug):
if revision_id:
# Display the revision given in the GET parameters
if version.revision.id == revision_id:
draft_data = version.field_dict
selected_version = version
break
else:
# Display the latest revision created by the current logged in user
if (
version.revision.user == request.user or request.user.is_staff
) and version.revision.date_created > installer.updated_at:
draft_data = version.field_dict
selected_version = version
revision_id = version.revision.id
break
if draft_data:
draft_data["reason"] = ""
if "runner_id" in draft_data:
draft_data["runner"] = draft_data["runner_id"]

if selected_version:
draft_data = version.field_dict
if draft_data:
if "runner_id" in draft_data:
draft_data["runner"] = draft_data["runner_id"]
# Reset reason only if user is building on someone else's draft
if version.revision.user != request.user:
draft_data["reason"] = ""

form = InstallerEditForm(
request.POST or None, instance=installer, initial=draft_data
Expand Down