Merge branch 'master' into develop

coldfront/core/project/tests/test_forms/test_renewal_forms/test_project_renewal_survey_form.py

@@ -37,6 +37,7 @@ def test_is_renewal_survey_completed_returns_false(self):
         # With the dummy backend, is_renewal_survey_completed returns whether
         # the PI username is less than 5 characters. This username is thus
         # greater than 5 characters.
+
         user = User.objects.create(
             email='[email protected]',
             first_name='Test',
@@ -74,6 +75,7 @@ def test_is_renewal_survey_completed_returns_true(self):
         # With the dummy backend, is_renewal_survey_completed returns whether
         # the PI username is less than 5 characters. This username is thus
         # less than 5 characters.
+
         user = User.objects.create(
             email='[email protected]',
             first_name='Test',

coldfront/core/project/utils_/renewal_survey/backends/google_forms.py

@@ -104,6 +104,10 @@ def get_renewal_survey_url(self, allocation_period_name, pi, project_name,
         if gform_info is None:
             return None
 
+        wks = self._get_gspread_wks(gform_info['sheet_id'])
+        if wks is None:
+            return None
+
         BASE_URL_ONE = 'https://docs.google.com/forms/d/e/'
         BASE_URL_TWO = '/viewform?usp=pp_url'
 

coldfront/templates/email/project_removal/project_removal.txt

@@ -1,6 +1,10 @@
 Dear {{ user_first_name }} {{ user_last_name }},
 
-{{ requester_first_name }} {{ requester_last_name }} of Project {{ project_name }} has requested to remove {{ remove_user_first_name }} {{ remove_user_last_name }} from {{ project_name }}. The request will be reviewed by administrators. You will receive a confirmation message after admins have removed {{ remove_user_first_name }} {{ remove_user_last_name }} from the project.
+{{ requester_first_name }} {{ requester_last_name }} of Project {{ project_name }} has requested to remove {{ remove_user_first_name }} {{ remove_user_last_name }} from {{ project_name }}. 
+
+The request will be reviewed by administrators. You will receive a confirmation message after admins have removed {{ remove_user_first_name }} {{ remove_user_last_name }} from the project.
+
+If applicable, please coordinate file sharing and/or backups with your group.
 
 If you have any questions, please contact us at {{ support_email }}.