diff --git a/assets/src/bundles/add_forge/index.js b/assets/src/bundles/add_forge/index.js --- a/assets/src/bundles/add_forge/index.js +++ b/assets/src/bundles/add_forge/index.js @@ -24,7 +24,7 @@ 'FIRST_ORIGIN_LOADED': 'First origin loaded', 'REJECTED': 'Rejected', 'SUSPENDED': 'Suspended', - 'DENIED': 'Denied' + 'UNSUCCESSFUL': 'Unsuccessful' }; return status in statusLabel ? statusLabel[status] : status; } diff --git a/assets/src/bundles/add_forge/request-dashboard.js b/assets/src/bundles/add_forge/request-dashboard.js --- a/assets/src/bundles/add_forge/request-dashboard.js +++ b/assets/src/bundles/add_forge/request-dashboard.js @@ -105,7 +105,7 @@ 'FIRST_ORIGIN_LOADED': [], 'REJECTED': [], 'SUSPENDED': ['PENDING'], - 'DENIED': [] + 'UNSUCCESSFUL': [] }; // Determine the possible next status out of the current one diff --git a/swh/web/add_forge_now/migrations/0007_rename_denied_request_status.py b/swh/web/add_forge_now/migrations/0007_rename_denied_request_status.py new file mode 100644 --- /dev/null +++ b/swh/web/add_forge_now/migrations/0007_rename_denied_request_status.py @@ -0,0 +1,51 @@ +# Generated by Django 2.2.28 on 2022-08-16 14:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("swh_web_add_forge_now", "0006_request_add_new_fields"), + ] + + operations = [ + migrations.AlterField( + model_name="request", + name="status", + field=models.TextField( + choices=[ + ("PENDING", "Pending"), + ("WAITING_FOR_FEEDBACK", "Waiting for feedback"), + ("FEEDBACK_TO_HANDLE", "Feedback to handle"), + ("ACCEPTED", "Accepted"), + ("SCHEDULED", "Scheduled"), + ("FIRST_LISTING_DONE", "First listing done"), + ("FIRST_ORIGIN_LOADED", "First origin loaded"), + ("REJECTED", "Rejected"), + ("SUSPENDED", "Suspended"), + ("UNSUCCESSFUL", "Unsuccessful"), + ], + default="PENDING", + ), + ), + migrations.AlterField( + model_name="requesthistory", + name="new_status", + field=models.TextField( + choices=[ + ("PENDING", "Pending"), + ("WAITING_FOR_FEEDBACK", "Waiting for feedback"), + ("FEEDBACK_TO_HANDLE", "Feedback to handle"), + ("ACCEPTED", "Accepted"), + ("SCHEDULED", "Scheduled"), + ("FIRST_LISTING_DONE", "First listing done"), + ("FIRST_ORIGIN_LOADED", "First origin loaded"), + ("REJECTED", "Rejected"), + ("SUSPENDED", "Suspended"), + ("UNSUCCESSFUL", "Unsuccessful"), + ], + null=True, + ), + ), + ] diff --git a/swh/web/add_forge_now/models.py b/swh/web/add_forge_now/models.py --- a/swh/web/add_forge_now/models.py +++ b/swh/web/add_forge_now/models.py @@ -32,7 +32,7 @@ FIRST_ORIGIN_LOADED = "First origin loaded" REJECTED = "Rejected" SUSPENDED = "Suspended" - DENIED = "Denied" + UNSUCCESSFUL = "Unsuccessful" @classmethod def choices(cls): @@ -47,6 +47,7 @@ self.ACCEPTED, self.REJECTED, self.SUSPENDED, + self.UNSUCCESSFUL, ], self.ACCEPTED: [self.SCHEDULED], self.SCHEDULED: [ @@ -58,7 +59,7 @@ self.FIRST_ORIGIN_LOADED: [], self.REJECTED: [], self.SUSPENDED: [self.PENDING], - self.DENIED: [], + self.UNSUCCESSFUL: [], } return next_statuses[self] # type: ignore diff --git a/swh/web/templates/add_forge_now/help.html b/swh/web/templates/add_forge_now/help.html --- a/swh/web/templates/add_forge_now/help.html +++ b/swh/web/templates/add_forge_now/help.html @@ -81,7 +81,7 @@