From 2005c102e629d5dd5082c26facd2282fbfb1015b Mon Sep 17 00:00:00 2001
From: Helena Rasche <hxr@hx42.org>
Date: Mon, 14 May 2018 15:33:19 +0200
Subject: [PATCH] force user_deletion on for GDPR users

---
 lib/galaxy/config.py                        | 1 +
 lib/galaxy/webapps/galaxy/config_schema.yml | 2 +-
 lib/galaxy/webapps/reports/config.py        | 1 +
 lib/galaxy/webapps/tool_shed/config.py      | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py
index cf0cdc13606..f4fb8cc98fd 100644
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -703,6 +703,7 @@ class Configuration(object):
             self.redact_email_in_job_name = True
             self.redact_user_details_in_bugreport = True
             self.redact_user_address_during_deletion = True
+            self.allow_user_deletion = True
 
     @property
     def sentry_dsn_public(self):
diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml
index a5a7fde61bb..c23ea3f0096 100644
--- a/lib/galaxy/webapps/galaxy/config_schema.yml
+++ b/lib/galaxy/webapps/galaxy/config_schema.yml
@@ -906,7 +906,7 @@ mapping:
           - $locale (complete format string for the server locale),
           - $iso8601 (complete format string as specified by ISO 8601 international
             standard).
-         
+
       default_locale:
         type: str
         default: auto
diff --git a/lib/galaxy/webapps/reports/config.py b/lib/galaxy/webapps/reports/config.py
index 7245e0bc7cb..c495de822ee 100644
--- a/lib/galaxy/webapps/reports/config.py
+++ b/lib/galaxy/webapps/reports/config.py
@@ -59,6 +59,7 @@ class Configuration(object):
         if self.gdpr_compliance:
             self.redact_username_in_logs = True
             self.redact_email_in_job_name = True
+            self.allow_user_deletion = True
 
     def get(self, key, default):
         return self.config_dict.get(key, default)
diff --git a/lib/galaxy/webapps/tool_shed/config.py b/lib/galaxy/webapps/tool_shed/config.py
index fcf9bf18222..50aa6b7ca2b 100644
--- a/lib/galaxy/webapps/tool_shed/config.py
+++ b/lib/galaxy/webapps/tool_shed/config.py
@@ -151,6 +151,7 @@ class Configuration(object):
             self.redact_username_during_deletion = True
             self.redact_email_during_deletion = True
             self.redact_username_in_logs = True
+            self.allow_user_deletion = True
 
     @property
     def shed_tool_data_path(self):