From b35dffd40d0f46664808eb1b31185c9572cc4c90 Mon Sep 17 00:00:00 2001
From: Joe Siltberg <git@joesiltberg.se>
Date: Tue, 16 Feb 2021 12:06:15 +0100
Subject: [PATCH] Use the default_to_body permission also when creating
 updates.

Fixes #3317
---
 CHANGELOG.md                                             | 1 +
 templates/web/base/report/update/form_user_loggedin.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5f4c78a126..ec8aaebb3b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
         - Send email reports in staff-only categories.
         - Fix Gaze sometimes being called twice on /around. #3324
         - Improved alert signup for phone-only user. #3367
+        - The permission default_to_body now also affects updates. #3317
     - Admin improvements:
         - Enable per-category hint customisation.
         - Move ban/unban buttons to user edit admin page.
diff --git a/templates/web/base/report/update/form_user_loggedin.html b/templates/web/base/report/update/form_user_loggedin.html
index 02e7de51f95..4297009c751 100644
--- a/templates/web/base/report/update/form_user_loggedin.html
+++ b/templates/web/base/report/update/form_user_loggedin.html
@@ -11,7 +11,7 @@
   [% IF can_contribute_as_another_user OR can_contribute_as_body OR can_contribute_as_anonymous_user %]
     <label for="form_as">[% loc('Provide update as') %]</label>
     <select id="form_as" class="form-control js-contribute-as" name="form_as">
-        <option value="myself" selected>[% loc('Yourself') %]</option>
+        <option value="myself" [% c.user.from_body AND ( c.user.has_body_permission_to('planned_reports') || c.user.has_body_permission_to('default_to_body') ) ? '' : 'selected'  %]>[% loc('Yourself') %]</option>
       [% IF can_contribute_as_another_user %]
         <option value="another_user">[% loc('Another user') %]</option>
       [% END %]
@@ -19,7 +19,7 @@
         <option value="anonymous_user">[% loc('Anonymous user') %]</option>
       [% END %]
       [% IF can_contribute_as_body %]
-        <option value="body">[% c.user.from_body.name %]</option>
+        <option value="body" [% c.user.from_body AND ( c.user.has_body_permission_to('planned_reports') || c.user.has_body_permission_to('default_to_body') ) ? 'selected' : ''  %]>[% c.user.from_body.name %]</option>
       [% END %]
     </select>
     <label for="form_username">[% loc('Email address') %]</label>