From d3b78962f1fc7e8d07c442b72c5b6de78b33b8e9 Mon Sep 17 00:00:00 2001 From: Tiago Lopes Date: Sat, 14 Jul 2018 23:24:11 +0100 Subject: [PATCH] Fixed errors in report detail template and controller. As well as in license detail controller. --- .../webapp/controller/ReportController.kt | 3 +-- .../resources/templates/report/report-detail-partial.mustache | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/github/ptosda/projectvalidationmanager/webapp/controller/ReportController.kt b/src/main/kotlin/com/github/ptosda/projectvalidationmanager/webapp/controller/ReportController.kt index 90f1ebf..0911727 100644 --- a/src/main/kotlin/com/github/ptosda/projectvalidationmanager/webapp/controller/ReportController.kt +++ b/src/main/kotlin/com/github/ptosda/projectvalidationmanager/webapp/controller/ReportController.kt @@ -240,7 +240,7 @@ class ReportController(val userService: UserService, model["project_id"] = projectId model["project_name"] = report.pk.project.name - model["error_name"] = report.error_info + model["error_info"] = report.error_info model["report_id"] = reportId model["readable_time"] = report.readableTimeStamp @@ -375,7 +375,6 @@ class ReportController(val userService: UserService, model["license_id"] = license.spdxId val dependencies = license.dependencies.filter { it.pk.dependency.direct } model["dependencies"] = dependencies.filter({ dep -> user.projects!!.any { it.pk.project!!.id == dep.pk.dependency.pk.report.pk.project.id } }).distinctBy { it.pk.dependency.pk.id } - model["error_info"] = license.errorInfo return "license/generic-license-detail" } diff --git a/src/main/resources/templates/report/report-detail-partial.mustache b/src/main/resources/templates/report/report-detail-partial.mustache index bcf3cf7..0f64515 100644 --- a/src/main/resources/templates/report/report-detail-partial.mustache +++ b/src/main/resources/templates/report/report-detail-partial.mustache @@ -7,9 +7,9 @@ Tag: {{build_tag}} {{/build_tag}}
- {{#build_tag}} + {{#error_info}} Error Info: {{error_info}} - {{/build_tag}} + {{/error_info}}