From c225401c197d585a024449698b1c8c081389cc3e Mon Sep 17 00:00:00 2001 From: Connor Osborn Date: Wed, 4 Apr 2018 12:36:53 -0700 Subject: [PATCH 1/2] Remove confusing Provider label in feedback email --- api/v2/views/email.py | 1 - core/templates/core/email/feedback.html | 2 -- 2 files changed, 3 deletions(-) diff --git a/api/v2/views/email.py b/api/v2/views/email.py index b4d95ff30..e4ea42653 100644 --- a/api/v2/views/email.py +++ b/api/v2/views/email.py @@ -137,7 +137,6 @@ def _email(self, user, data): "ui": data.get("user-interface", ""), "server": settings.SERVER_URL, "feedback": data["message"], - "provider": user.selected_identity.provider, "instances": instances, "volumes": volumes, } diff --git a/core/templates/core/email/feedback.html b/core/templates/core/email/feedback.html index 2936cf918..afa788319 100644 --- a/core/templates/core/email/feedback.html +++ b/core/templates/core/email/feedback.html @@ -2,8 +2,6 @@ Feedback : {{ feedback|safe }} -Provider : {{ provider.location }} - User-interface : {{ ui }} Server : {{ server }} From 5fa97108c2a7dc045b06f06725db8415a4e9c8ff Mon Sep 17 00:00:00 2001 From: Connor Osborn Date: Wed, 18 Apr 2018 10:01:58 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f5f7e3d0..44a686fcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) ### Fixed - `application_to_provider` was using an invalid method in Glance Client v1 to upload image data ([#618](https://github.com/cyverse/atmosphere/pull/618)) +### Removed + - In the general feedback email we no longer include the users selected + provider, as it's no longer relevant ([#603](https://github.com/cyverse/atmosphere/pull/603)) + ## [v32-2](https://github.com/cyverse/atmosphere/compare/v32-1...v32-2) - 2018-04-26 ### Fixed - Quota updates concerning volumes would silently fail ([#611](https://github.com/cyverse/atmosphere/pull/611))