From d84fd32b91aa666ff747cc9b58a16068bbf96032 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 29 Oct 2024 15:00:09 +0000 Subject: [PATCH] Bug 37910: Sync fixes to detail page Signed-off-by: David Nind Signed-off-by: Aleisha Amohia Signed-off-by: Martin Renvoize --- .../prog/en/modules/catalogue/detail.tt | 35 ++++++++++++++----- .../prog/en/modules/cataloguing/concerns.tt | 1 - 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 4fb8c280e10..428dfdd7f2f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1276,11 +1276,13 @@ { "data": "reported_date:reporter.firstname", "render": function(data, type, row, meta) { - let reported = '' + $datetime(row.reported_date) + ''; - reported += '' + $patron_to_html(row.reporter, { + let reported = '
'; + reported += '' + $patron_to_html(row.reporter, { display_cardnumber: false, url: true }) + ''; + reported += '' + $datetime(row.reported_date) + ''; + reported += '
'; return reported; }, "searchable": true, @@ -1289,13 +1291,20 @@ { "data": "title:body", "render": function(data, type, row, meta) { - let resolved = ( row.resolved_date ) ? true : false; - let result = '' + row.title; + let result = '
'; + + // Title link on the left + result += '' + row.title + ''; + + // Updates count on the right, if it exists if (row.updates_count) { - result += ' ' + row.updates_count; + result += ' ' + row.updates_count + ''; } - result += ''; + + // Hidden detail content + result += '
'; result += ''; + return result; }, "searchable": true, @@ -1316,26 +1325,34 @@ "render": function(data, type, row, meta) { let result = ''; if (row.resolved_date) { - result += _("Resolved by:") + ' ' + $patron_to_html(row.resolver, { + result += "
"; + result += _("Resolved by") + ' ' + $patron_to_html(row.resolver, { display_cardnumber: false, url: true }) + ''; + result += "
"; if (row.status) { + result += '
'; result += ' ' + _("as") + ' '; result += row._strings.status ? escape_str(row._strings.status.str) : ""; + result += '
'; } - result += '' + $datetime(row.resolved_date) + ''; + result += '
' + $datetime(row.resolved_date) + '
'; } else { + result += '
'; if (row.status) { result += row._strings.status ? escape_str(row._strings.status.str) : ""; } else { result += _("Open"); } + result += '
'; if (row.assignee) { - result += '' + _("Assigned to: ") + $patron_to_html(row.assignee, { + result += '
'; + result += _("Assigned to: ") + ' ' + $patron_to_html(row.assignee, { display_cardnumber: false, url: true }) + ''; + result += '
'; } } return result; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt index 668558921dc..ab01dab6e5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt @@ -142,7 +142,6 @@ { "data": "title:body", "render": function(data, type, row, meta) { - let resolved = ( row.resolved_date ) ? true : false; let result = '
'; // Title link on the left -- 2.47.0