Skip to content

Commit 2c5750d

Browse files
committed
Rename "todos" in "todo" in mapping for consistency #1524
Signed-off-by: tdruez <tdruez@nexb.com>
1 parent ec4c163 commit 2c5750d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

scanpipe/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ class ProjectReportForm(forms.Form):
281281
("codebaseresource", "Resources"),
282282
("codebaserelation", "Relations"),
283283
("projectmessage", "Messages"),
284-
("todos", "TODOs"),
284+
("todo", "TODOs"),
285285
],
286286
required=True,
287287
initial="discoveredpackage",

scanpipe/pipes/output.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def get_queryset(project, model_name):
9696
CodebaseRelation.objects.select_related("from_resource", "to_resource")
9797
),
9898
"projectmessage": ProjectMessage.objects.all(),
99-
"todos": CodebaseResource.objects.files().status(flag.REQUIRES_REVIEW),
99+
"todo": CodebaseResource.objects.files().status(flag.REQUIRES_REVIEW),
100100
}
101101

102102
queryset = querysets.get(model_name)
@@ -309,7 +309,7 @@ def to_json(project):
309309
"codebaseresource": "resource",
310310
"codebaserelation": "relation",
311311
"projectmessage": "message",
312-
"todos": "todo",
312+
"todo": "todo",
313313
}
314314

315315
object_type_to_model_name = {
@@ -577,7 +577,7 @@ def add_vulnerabilities_sheet(workbook, project):
577577

578578

579579
def add_todos_sheet(workbook, project, exclude_fields):
580-
todos_queryset = get_queryset(project, "todos")
580+
todos_queryset = get_queryset(project, "todo")
581581
if todos_queryset:
582582
queryset_to_xlsx_worksheet(
583583
todos_queryset, workbook, exclude_fields, worksheet_name="TODOS"

scanpipe/tests/test_views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def test_scanpipe_views_project_action_report_view(self):
197197
data = {
198198
"action": "report",
199199
"selected_ids": f"{self.project1.uuid}",
200-
"model_name": "todos",
200+
"model_name": "todo",
201201
}
202202
response = self.client.post(url, data=data, follow=True)
203203
self.assertEqual("report.xlsx", response.filename)

scanpipe/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ def get_export_xlsx_prepend_fields(self):
12451245
return ["project"]
12461246

12471247
def get_export_xlsx_worksheet_name(self):
1248-
if self.report_form.cleaned_data.get("model_name") == "todos":
1248+
if self.report_form.cleaned_data.get("model_name") == "todo":
12491249
return "TODOS"
12501250

12511251
def get_export_xlsx_filename(self):

0 commit comments

Comments
 (0)