diff --git a/qgis-app/base/forms/processing_forms.py b/qgis-app/base/forms/processing_forms.py index 97ea1770..514d13f3 100644 --- a/qgis-app/base/forms/processing_forms.py +++ b/qgis-app/base/forms/processing_forms.py @@ -10,10 +10,18 @@ class ResourceBaseReviewForm(forms.Form): APPROVAL_OPTIONS = [('approve', 'Approve'), ('reject', 'Reject')] approval = forms.ChoiceField(required=True, choices=APPROVAL_OPTIONS, widget=forms.RadioSelect, initial='approve') - comment = forms.CharField(widget=forms.Textarea( - attrs={'placeholder': _('Please provide clear feedback if you decided ' - 'to not approve this GeoPackage.'), - 'rows': "5"})) + comment = forms.CharField() + + def __init__(self, *args, **kwargs): + self.resource_name = kwargs.pop('resource_name', 'resource') + super(ResourceBaseReviewForm, self).__init__(*args, **kwargs) + self.fields['comment'].widget = forms.Textarea( + attrs={ + 'placeholder': _( + 'Please provide clear feedback if you decided to not ' + 'approve this %s.') % self.resource_name, + 'rows': "5"}) + class ResourceBaseSearchForm(forms.Form): diff --git a/qgis-app/base/views/processing_view.py b/qgis-app/base/views/processing_view.py index a2d489a6..320ffbea 100644 --- a/qgis-app/base/views/processing_view.py +++ b/qgis-app/base/views/processing_view.py @@ -299,7 +299,9 @@ def get_context_data(self, **kwargs): .username context['reviewer'] = reviewer if user.is_staff or is_resources_manager(user): - context['form'] = ResourceBaseReviewForm() + context['form'] = ResourceBaseReviewForm( + resource_name=self.resource_name + ) if self.is_3d_model: context['url_viewer'] = "%s_viewer" % self.resource_name_url_base return context diff --git a/qgis-app/layerdefinitions/tests/test_forms.py b/qgis-app/layerdefinitions/tests/test_forms.py new file mode 100644 index 00000000..7d336f90 --- /dev/null +++ b/qgis-app/layerdefinitions/tests/test_forms.py @@ -0,0 +1,13 @@ +from django.test import TestCase + +from base.forms.processing_forms import ResourceBaseReviewForm + + +class TestFormResourceBaseReviewForm(TestCase): + def test_review_form_comment_includes_resource_name(self): + form = ResourceBaseReviewForm(resource_name='test resource') + self.assertIn( + 'placeholder="Please provide clear feedback if you decided to not ' + 'approve this test resource." required id="id_comment"', + form.as_table() + )