diff --git a/src/core/models.py b/src/core/models.py
index 6e196623..0a022506 100644
--- a/src/core/models.py
+++ b/src/core/models.py
@@ -261,11 +261,9 @@ def write_report(self, csvfile):
"message",
"entity_id",
"raw_input",
- "api_response",
]
)
for cmd in self.commands():
- called_api = bool(cmd.response_json)
writer.writerow(
[
self.pk,
@@ -276,7 +274,6 @@ def write_report(self, csvfile):
cmd.message,
cmd.entity_id(),
cmd.raw.replace("\t", "|"), # tabs are weird in csv
- cmd.response_json if called_api else None,
]
)
diff --git a/src/web/templates/batches.html b/src/web/templates/batches.html
index ba4a4759..3c6eeb39 100644
--- a/src/web/templates/batches.html
+++ b/src/web/templates/batches.html
@@ -54,7 +54,7 @@
{% translate 'Last batches' %} {% if username is not None %} {% translate '
{% endif %}
- | {{ batch.name }} |
+ {% if batch.name %}{{ batch.name }}{% else %}-{% endif %} |
{{ batch.get_status_display | upper }} |
{{ batch.modified }} |
diff --git a/src/web/tests/test_views.py b/src/web/tests/test_views.py
index 2969a750..f61e3edf 100644
--- a/src/web/tests/test_views.py
+++ b/src/web/tests/test_views.py
@@ -229,6 +229,19 @@ def test_create_v1_batch_logged_user(self, mocker):
self.assertEqual(list(response.context["page"].object_list), [batch])
self.assertTrue(batch.is_initial)
+ @requests_mock.Mocker()
+ def test_create_empty_name(self, mocker):
+ ApiMocker.is_autoconfirmed(mocker)
+ user, api_client = self.login_user_and_get_token("user")
+ response = self.client.post("/batch/new/", data={"type": "v1", "commands": "CREATE"})
+ self.assertEqual(response.status_code, 302)
+ response = self.client.get(response.url)
+ self.assertEqual(response.status_code, 200)
+ response = self.client.post("/batch/new/preview/allow_start/")
+ self.assertEqual(response.status_code, 302)
+ response = self.client.get(response.url)
+ self.assertTemplateUsed("batch.html")
+
@requests_mock.Mocker()
def test_create_csv_batch_logged_user(self, mocker):
ApiMocker.is_autoconfirmed(mocker)
@@ -596,9 +609,8 @@ def test_batch_report(self, mocker):
self.assertEqual(response.status_code, 200)
self.assertEqual(response.headers["Content-Disposition"], f'attachment; filename="batch-{pk}-report.csv"')
result = (
- """b'batch_id,index,operation,status,error,message,entity_id,raw_input,api_response\\r\\n"""
- """1,0,set_statement,Done,,,Q1234,Q1234|P2|Q1,{\\\'id\\\': \\\'Q1234$stuff\\\'}\\r\\n"""
- """1,1,set_label,Done,,,Q11,"Q11|Len|""label""\","""
- """"{\\\'id\\\': \\\'Q11\\\', \\\'labels\\\': {\\\'en\\\': \\\'label\\\'}}"\\r\\n\'"""
+ """b'batch_id,index,operation,status,error,message,entity_id,raw_input\\r\\n"""
+ """1,0,set_statement,Done,,,Q1234,Q1234|P2|Q1\\r\\n"""
+ """1,1,set_label,Done,,,Q11,"Q11|Len|""label""\"\\r\\n\'"""
)
self.assertEqual(result, str(response.content).strip())
diff --git a/src/web/views/new_batch.py b/src/web/views/new_batch.py
index 6c6c1e7f..e9f636fe 100644
--- a/src/web/views/new_batch.py
+++ b/src/web/views/new_batch.py
@@ -137,8 +137,6 @@ def new_batch(request):
raise ParserException("Command string cannot be empty")
batch_name = batch_name.strip()
- if not batch_name:
- raise ParserException("Batch name cannot be empty")
if batch_type == "v1":
parser = V1CommandParser()
|