From 32f640bfbe0072f45a856abf2ee9d0fba2fab75b Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Fri, 14 Jun 2024 09:41:18 +0300 Subject: [PATCH 1/2] Allow unpublish feed --- qgisfeedproject/qgisfeed/views.py | 10 ++++---- .../templates/feeds/confirmation_modal.html | 21 ++++++++++++++++ .../feeds/feed_item_confirmation.html | 2 +- .../feeds/feed_item_form_widgets.html | 24 +++++++++++++++++++ 4 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 qgisfeedproject/templates/feeds/confirmation_modal.html diff --git a/qgisfeedproject/qgisfeed/views.py b/qgisfeedproject/qgisfeed/views.py index 0ff5eae..511489c 100644 --- a/qgisfeedproject/qgisfeed/views.py +++ b/qgisfeedproject/qgisfeed/views.py @@ -372,12 +372,14 @@ def post(self, request, pk): user = request.user user_is_approver = user.has_perm("qgisfeed.publish_qgisfeedentry") form = self.form_class(request.POST, request.FILES, instance=feed_entry) - if form.is_valid(): instance = form.save(commit=False) - publish = bool(request.POST.get('publish', '')) - if publish and user_is_approver: - instance.published = True + if request.POST.get('publish') and user_is_approver: + try: + publish = bool(int(request.POST.get('publish'))) + instance.published = publish + except ValueError: + pass instance.save() success = True diff --git a/qgisfeedproject/templates/feeds/confirmation_modal.html b/qgisfeedproject/templates/feeds/confirmation_modal.html new file mode 100644 index 0000000..02a8a4e --- /dev/null +++ b/qgisfeedproject/templates/feeds/confirmation_modal.html @@ -0,0 +1,21 @@ + \ No newline at end of file diff --git a/qgisfeedproject/templates/feeds/feed_item_confirmation.html b/qgisfeedproject/templates/feeds/feed_item_confirmation.html index 3ae24d7..b76e0e8 100644 --- a/qgisfeedproject/templates/feeds/feed_item_confirmation.html +++ b/qgisfeedproject/templates/feeds/feed_item_confirmation.html @@ -36,7 +36,7 @@ {% elif not published and user_is_approver and form.instance.pk%} - + + + {% endif %} + {% if not form.instance.pk %}
@@ -210,4 +233,5 @@

{{ error }}

{% endfor %} {% include 'feeds/set_spatial_filter_modal.html' %} + {% include 'feeds/confirmation_modal.html' %} \ No newline at end of file From 7fd61f437b923c4b9c9e5fb1d2965d0c09a2f43b Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Fri, 14 Jun 2024 11:02:16 +0300 Subject: [PATCH 2/2] Update unit test --- qgisfeedproject/qgisfeed/tests.py | 141 +++++++++--------------------- 1 file changed, 40 insertions(+), 101 deletions(-) diff --git a/qgisfeedproject/qgisfeed/tests.py b/qgisfeedproject/qgisfeed/tests.py index 4d0b4ef..29a9e04 100644 --- a/qgisfeedproject/qgisfeed/tests.py +++ b/qgisfeedproject/qgisfeed/tests.py @@ -413,6 +413,21 @@ class FeedsItemFormTestCase(TestCase): fixtures = ['qgisfeed.json', 'users.json'] def setUp(self): self.client = Client() + spatial_filter = Polygon(((0, 0), (0, 1), (1, 1), (1, 0), (0, 0))) + image_path = join(settings.MEDIA_ROOT, "feedimages", "rust.png") + self.post_data = { + 'title': 'QGIS core will be rewritten in Rust', + 'image': open(image_path, "rb"), + 'content': '

Tired with C++ intricacies, the core developers have decided to rewrite QGIS in Rust', + 'url': 'https://www.null.com', + 'sticky': False, + 'sorting': 0, + 'language_filter': 'en', + 'spatial_filter': str(spatial_filter), + 'publish_from': '2023-10-18 14:46:00+00', + 'publish_to': '2023-10-29 14:46:00+00' + } + def test_authenticated_user_access(self): self.client.login(username='admin', password='admin') @@ -469,23 +484,8 @@ def test_nonstaff_user_redirect_to_login(self): def test_authenticated_user_add_feed(self): # Add a feed entry test self.client.login(username='staff', password='staff') - spatial_filter = Polygon(((0, 0), (0, 1), (1, 1), (1, 0), (0, 0))) - image_path = join(settings.MEDIA_ROOT, "feedimages", "rust.png") - - post_data = { - 'title': 'QGIS core will be rewritten in Rust', - 'image': open(image_path, "rb"), - 'content': '

Tired with C++ intricacies, the core developers have decided to rewrite QGIS in Rust', - 'url': 'https://www.null.com', - 'sticky': False, - 'sorting': 0, - 'language_filter': 'en', - 'spatial_filter': str(spatial_filter), - 'publish_from': '2023-10-18 14:46:00+00', - 'publish_to': '2023-10-29 14:46:00+00' - } - response = self.client.post(reverse('feed_entry_add'), data=post_data) + response = self.client.post(reverse('feed_entry_add'), data=self.post_data) self.assertEqual(response.status_code, 302) self.assertRedirects(response, reverse('feeds_list')) @@ -493,23 +493,8 @@ def test_authenticated_user_add_feed(self): def test_authenticated_user_update_feed(self): # Update a feed entry test self.client.login(username='admin', password='admin') - spatial_filter = Polygon([(0, 0), (0, 1), (1, 1), (1, 0), (0, 0)]) - image_path = join(settings.MEDIA_ROOT, "feedimages", "rust.png") - - post_data = { - 'title': 'QGIS core will be rewritten in Rust', - 'image': open(image_path, "rb"), - 'content': '

Tired with C++ intricacies, the core developers have decided to rewrite QGIS in Rust', - 'url': 'https://www.null.com', - 'sticky': False, - 'sorting': 0, - 'language_filter': 'en', - 'spatial_filter': str(spatial_filter), - 'publish_from': '2023-10-18 14:46:00+00', - 'publish_to': '2023-10-29 14:46:00+00' - } - response = self.client.post(reverse('feed_entry_update', args=[3]), data=post_data) + response = self.client.post(reverse('feed_entry_update', args=[3]), data=self.post_data) self.assertEqual(response.status_code, 302) self.assertRedirects(response, reverse('feeds_list')) @@ -517,23 +502,8 @@ def test_authenticated_user_update_feed(self): def test_not_allowed_user_update_feed(self): # Update a feed entry with a non allowed user self.client.login(username='staff', password='staff') - spatial_filter = Polygon([(0, 0), (0, 1), (1, 1), (1, 0), (0, 0)]) - image_path = join(settings.MEDIA_ROOT, "feedimages", "rust.png") - - post_data = { - 'title': 'QGIS core will be rewritten in Rust', - 'image': open(image_path, "rb"), - 'content': '

Tired with C++ intricacies, the core developers have decided to rewrite QGIS in Rust', - 'url': 'https://www.null.com', - 'sticky': False, - 'sorting': 0, - 'language_filter': 'en', - 'spatial_filter': str(spatial_filter), - 'publish_from': '2023-10-18 14:46:00+00', - 'publish_to': '2023-10-29 14:46:00+00', - } - response = self.client.post(reverse('feed_entry_update', args=[7]), data=post_data) + response = self.client.post(reverse('feed_entry_update', args=[7]), data=self.post_data) self.assertEqual(response.status_code, 302) self.assertRedirects(response, reverse('login') + '?next=' + reverse('feed_entry_update', args=[7])) self.assertIsNone(response.context) @@ -541,24 +511,8 @@ def test_not_allowed_user_update_feed(self): def test_allowed_user_publish_feed(self): # Publish a feed entry test self.client.login(username='admin', password='admin') - spatial_filter = Polygon([(0, 0), (0, 1), (1, 1), (1, 0), (0, 0)]) - image_path = join(settings.MEDIA_ROOT, "feedimages", "rust.png") - - post_data = { - 'title': 'QGIS core will be rewritten in Rust', - 'image': open(image_path, "rb"), - 'content': '

Tired with C++ intricacies, the core developers have decided to rewrite QGIS in Rust', - 'url': 'https://www.null.com', - 'sticky': False, - 'sorting': 0, - 'language_filter': 'en', - 'spatial_filter': str(spatial_filter), - 'publish_from': '2023-10-18 14:46:00+00', - 'publish_to': '2023-10-29 14:46:00+00', - 'publish': 'true' - } - - response = self.client.post(reverse('feed_entry_update', args=[7]), data=post_data) + self.post_data['publish'] = 1 + response = self.client.post(reverse('feed_entry_update', args=[7]), data=self.post_data) self.assertEqual(response.status_code, 302) self.assertRedirects(response, reverse('feeds_list')) @@ -573,30 +527,30 @@ def test_allowed_staff_publish_feed(self): group.user_set.add(user) self.client.login(username='staff', password='staff') - spatial_filter = Polygon([(0, 0), (0, 1), (1, 1), (1, 0), (0, 0)]) - image_path = join(settings.MEDIA_ROOT, "feedimages", "rust.png") - - post_data = { - 'title': 'QGIS core will be rewritten in Rust', - 'image': open(image_path, "rb"), - 'content': '

Tired with C++ intricacies, the core developers have decided to rewrite QGIS in Rust', - 'url': 'https://www.null.com', - 'sticky': False, - 'sorting': 0, - 'language_filter': 'en', - 'spatial_filter': str(spatial_filter), - 'publish_from': '2023-10-18 14:46:00+00', - 'publish_to': '2023-10-29 14:46:00+00', - 'publish': 'true' - } - - response = self.client.post(reverse('feed_entry_update', args=[7]), data=post_data) + self.post_data['publish'] = 1 + response = self.client.post(reverse('feed_entry_update', args=[7]), data=self.post_data) self.assertEqual(response.status_code, 302) self.assertRedirects(response, reverse('feeds_list')) updated_data = QgisFeedEntry.objects.get(pk=7) self.assertTrue(updated_data.published) + def test_allowed_staff_unpublish_feed(self): + # Update a feed entry with an allowed staff user + user = User.objects.get(username='staff') + user.save() + group = Group.objects.get(name='qgisfeedentry_approver') + group.user_set.add(user) + + self.client.login(username='staff', password='staff') + self.post_data['publish'] = 0 + + response = self.client.post(reverse('feed_entry_update', args=[7]), data=self.post_data) + self.assertEqual(response.status_code, 302) + self.assertRedirects(response, reverse('feeds_list')) + + updated_data = QgisFeedEntry.objects.get(pk=7) + self.assertFalse(updated_data.published) def test_authenticated_user_add_invalid_data(self): # Add a feed entry that contains invalid data @@ -643,24 +597,9 @@ def test_get_field_max_length(self): def test_add_feed_with_reviewer(self): # Add a feed entry with specified reviewer test self.client.login(username='staff', password='staff') - spatial_filter = Polygon(((0, 0), (0, 1), (1, 1), (1, 0), (0, 0))) - image_path = join(settings.MEDIA_ROOT, "feedimages", "rust.png") - - post_data = { - 'title': 'QGIS core will be rewritten in Rust', - 'image': open(image_path, "rb"), - 'content': '

Tired with C++ intricacies, the core developers have decided to rewrite QGIS in Rust', - 'url': 'https://www.null.com', - 'sticky': False, - 'sorting': 0, - 'language_filter': 'en', - 'spatial_filter': str(spatial_filter), - 'publish_from': '2023-10-18 14:46:00+00', - 'publish_to': '2023-10-29 14:46:00+00', - 'reviewers': [1] - } + self.post_data['reviewers'] = [1] - response = self.client.post(reverse('feed_entry_add'), data=post_data) + response = self.client.post(reverse('feed_entry_add'), data=self.post_data) self.assertEqual(response.status_code, 302) self.assertRedirects(response, reverse('feeds_list'))