From 8051b4f744913448116e0feb2cbbff6aad83861b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Szulc?= Date: Tue, 10 Sep 2024 13:25:19 +0200 Subject: [PATCH 1/6] Updated changelog for 20240910.1 version. --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 03da687348..d8d3e03264 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +ralph (20240910.1) bionic; urgency=medium + + [ Paweł Szulc ] + * Spaces in serial number and barcode are now forbidden + * Add missing migration + + [ Olga Matyla ] + * Require field property_of + * Fix clean method + * Require service environment + + -- Paweł Szulc Tue, 10 Sep 2024 11:24:19 +0000 + ralph (20240903.2) bionic; urgency=medium * Fix ipxe (#3841) From dcdae1af5482fba45dd708437baf592507dffd4f Mon Sep 17 00:00:00 2001 From: Olga Matyla <73503512+matyldv@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:52:32 +0200 Subject: [PATCH 2/6] Add missing error message for property of field (#3845) --- src/ralph/assets/models/assets.py | 2 +- src/ralph/back_office/tests/test_api.py | 2 +- src/ralph/data_center/tests/test_api.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ralph/assets/models/assets.py b/src/ralph/assets/models/assets.py index d657d55df5..95e322b711 100644 --- a/src/ralph/assets/models/assets.py +++ b/src/ralph/assets/models/assets.py @@ -548,7 +548,7 @@ def clean(self): error_message = [_('Property of field is required')] errors.update( { - 'property_of': error_message, + '__all__': error_message, } ) if errors: diff --git a/src/ralph/back_office/tests/test_api.py b/src/ralph/back_office/tests/test_api.py index 3934bb57b1..0637f29dad 100644 --- a/src/ralph/back_office/tests/test_api.py +++ b/src/ralph/back_office/tests/test_api.py @@ -118,7 +118,7 @@ def test_create_back_office_asset_without_property_of(self): response = self.client.post(url, data, format='json') self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEqual(response.data, { - 'property_of': ['Property of field is required'], + '__all__': ['Property of field is required'], }) def test_patch_back_office_asset(self): diff --git a/src/ralph/data_center/tests/test_api.py b/src/ralph/data_center/tests/test_api.py index 1bbe76536e..684d41b157 100644 --- a/src/ralph/data_center/tests/test_api.py +++ b/src/ralph/data_center/tests/test_api.py @@ -242,7 +242,7 @@ def test_create_data_center_without_property_of(self): response = self.client.post(url, data, format='json') self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEqual(response.data, { - 'property_of': ['Property of field is required'], + '__all__': ['Property of field is required'], }) def test_patch_data_center_asset(self): From 6adca0108a5161f660307caf6b37a5069ad6c956 Mon Sep 17 00:00:00 2001 From: Olga Matyla Date: Mon, 16 Sep 2024 15:04:51 +0200 Subject: [PATCH 3/6] Updated changelog for 20240916.1 version. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index d8d3e03264..6e47819d78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ralph (20240916.1) bionic; urgency=medium + + [ root ] + * UNRELEASED + + -- Olga Matyla Mon, 16 Sep 2024 13:00:39 +0000 + ralph (20240910.1) bionic; urgency=medium [ Paweł Szulc ] From 61933ba3ad61017d18f4684e89c7b759146f76fd Mon Sep 17 00:00:00 2001 From: Olga Matyla Date: Mon, 16 Sep 2024 15:37:16 +0200 Subject: [PATCH 4/6] Updated changelog for 20240916.1 version. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6e47819d78..69b909e2a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ralph (20240916.1) bionic; urgency=medium + + [ root ] + * UNRELEASED + + -- Olga Matyla Mon, 16 Sep 2024 13:33:23 +0000 + ralph (20240916.1) bionic; urgency=medium [ root ] From 271474603ce1b206751fd23fd780e453bfde86df Mon Sep 17 00:00:00 2001 From: Olga Matyla Date: Mon, 16 Sep 2024 16:04:06 +0200 Subject: [PATCH 5/6] Updated changelog for 20240916.1 version. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 69b909e2a4..cf3b425176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ralph (20240916.1) bionic; urgency=medium + + [ root ] + * UNRELEASED + + -- Olga Matyla Mon, 16 Sep 2024 14:01:15 +0000 + ralph (20240916.1) bionic; urgency=medium [ root ] From 18ce7dfbdcb94158c35977bc3b43c8ab3e0c2e80 Mon Sep 17 00:00:00 2001 From: Olga Matyla Date: Mon, 16 Sep 2024 16:08:08 +0200 Subject: [PATCH 6/6] Updated changelog for 20240916.1 version. --- debian/changelog | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index cf3b425176..99d924fc73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,24 +1,10 @@ ralph (20240916.1) bionic; urgency=medium - [ root ] - * UNRELEASED + [ Olga Matyla ] + * Add missing error message for property of field -- Olga Matyla Mon, 16 Sep 2024 14:01:15 +0000 -ralph (20240916.1) bionic; urgency=medium - - [ root ] - * UNRELEASED - - -- Olga Matyla Mon, 16 Sep 2024 13:33:23 +0000 - -ralph (20240916.1) bionic; urgency=medium - - [ root ] - * UNRELEASED - - -- Olga Matyla Mon, 16 Sep 2024 13:00:39 +0000 - ralph (20240910.1) bionic; urgency=medium [ Paweł Szulc ]