From f93d28e8c6fec635eba2281b4490d47c0fc54018 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 3 May 2021 16:04:16 +0200
Subject: [PATCH] Bug 28271: Preselect the current item lost value

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc | 2 +-
 koha-tmpl/intranet-tmpl/prog/js/checkouts.js                 | 4 +++-
 svc/return_claims                                            | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
index 2f9bf6cb17..002a1b4440 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -149,7 +149,7 @@
             <label for="new_lost_status">New item lost value:</label>
             [% SET itemlost = AuthorisedValues.GetAuthValueDropbox('LOST') %]
             <select class="form-control" id="new_lost_status">
-              <option value="0"></option>
+              <option value="0">(Not lost)</option>
               [% FOREACH lost IN itemlost %]
                   <option value="[% lost.authorised_value | html %]">[% lost.lib | html %]</option>
               [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
index 3c3da8ceef..43f62ecdcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
@@ -1011,7 +1011,7 @@ $(document).ready(function() {
                                 ? '<li><a href="#" class="return-claim-tools-delete" data-return-claim-id="' + oObj.id + '"><i class="fa fa-trash"></i> ' + __("Delete") + '</a></li>'
                                 : "";
                             let resolve_html = ! oObj.resolution
-                                ? '<li><a href="#" class="return-claim-tools-resolve" data-return-claim-id="' + oObj.id + '"><i class="fa fa-check-square"></i> ' + __("Resolve") + '</a></li>'
+                                ? '<li><a href="#" class="return-claim-tools-resolve" data-return-claim-id="' + oObj.id + '" data-current-lost-status="' + escape_str(oObj.itemlost) + '"><i class="fa fa-check-square"></i> ' + __("Resolve") + '</a></li>'
                                 : "";
 
                             return  '<div class="btn-group">'
@@ -1135,8 +1135,10 @@ $(document).ready(function() {
     // Handle return claim resolution
     $('body').on('click', '.return-claim-tools-resolve', function() {
         let id = $(this).data('return-claim-id');
+        let current_lost_status = $(this).data('current-lost-status');
 
         $('#claims-returned-resolved-modal-id').val(id);
+        $("#new_lost_status").val(current_lost_status);
         $('#claims-returned-resolved-modal').modal()
     });
 
diff --git a/svc/return_claims b/svc/return_claims
index e5ed56ea43..2a616f08e2 100755
--- a/svc/return_claims
+++ b/svc/return_claims
@@ -77,7 +77,8 @@ my $sql = qq{
         biblio.author,
 
         items.enumchron,
-        items.barcode
+        items.barcode,
+        items.itemlost
     FROM return_claims
         LEFT JOIN items USING ( itemnumber )
         LEFT JOIN biblio USING ( biblionumber )
-- 
2.39.5