From bb65be3e8be03124b48a2478760fe8d6cfdfa150 Mon Sep 17 00:00:00 2001 From: Jason McBrayer Date: Sun, 14 Oct 2018 08:36:47 -0400 Subject: [PATCH] Don't lose text or spoiler text when expanding toot form --- brutaldon/templates/main/post_minimal_partial.html | 1 + brutaldon/views.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/brutaldon/templates/main/post_minimal_partial.html b/brutaldon/templates/main/post_minimal_partial.html index ffb6071..0ed516d 100644 --- a/brutaldon/templates/main/post_minimal_partial.html +++ b/brutaldon/templates/main/post_minimal_partial.html @@ -33,6 +33,7 @@ ic-get-from="{% url "toot" %}" ic-target="#post-form" ic-select-from-response="#post-form" + ic-include="#id_status,#id_spoiler_text" title="Complete toot form (media, visibility, etc" class="fa fa-edit"> diff --git a/brutaldon/views.py b/brutaldon/views.py index 19a1379..cdf656a 100644 --- a/brutaldon/views.py +++ b/brutaldon/views.py @@ -424,10 +424,12 @@ def toot(request, mention=None): if mention: if not mention.startswith('@'): mention = '@'+mention - form = PostForm(initial={'visibility': request.session['user'].source.privacy, + form = PostForm(request.GET, request.FILES, + initial={'visibility': request.session['user'].source.privacy, 'status': mention + '\n' }) else: - form = PostForm(initial={'visibility': request.session['user'].source.privacy}) + form = PostForm(request.GET, request.FILES, + initial={'visibility': request.session['user'].source.privacy}) return render(request, 'main/post.html', {'form': form, 'own_acct': request.session['user'],