From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 20 May 2016 21:34:59 +0000 (-0400)
Subject: JBAS-1150 Record bucket 'deleted' column
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7239c47a509f9fbc3984f8f578c5de9a6d3983d6;p=working%2FEvergreen.git

JBAS-1150 Record bucket 'deleted' column

Includes new 'deleted' column on 'mvr' class.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index f77f7213a5..f7be967094 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -136,6 +136,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<field name="series" oils_persist:virtual="true" />
 			<field name="serials" oils_persist:virtual="true" />
 			<field name="foreign_copy_maps" oils_persist:virtual="true" />
+			<field name="deleted" oils_persist:virtual="true" />
 		</fields>
 	</class>
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
index 15f2f9c61a..95c5ee5fc8 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
@@ -79,6 +79,7 @@ sub _records_to_mods {
         my $mods = $u->finish_mods_batch();
         $mods->doc_id($content->id());
         $mods->tcn($content->tcn_value);
+        $mods->deleted($content->deleted);
         push @results, $mods;
     }
 
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets.js b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
index 77b7408091..0d1b8d6e44 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets.js
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
@@ -119,6 +119,20 @@ cat.record_buckets.prototype = {
             } 
         );
 
+        var col = columns.filter(function(c) {return c.id == 'deleted'})[0];
+        if (col) {
+            // JBAS-1150 Turn the deleted column into a reference to the bib
+            // record's deleted column instead of the copy's deleted column.
+            col.fm_class = 'mvr';
+            col.label = 'Record Deleted?'; 
+            col.render = function(my) {
+                if (!my.mvr) return;
+                var key = get_bool(my.mvr.deleted()) ? 
+                    'staff.circ.utils.yes' : 'staff.circ.utils.no';
+                return document.getElementById('circStrings').getString(key);
+            }
+        }
+
         JSAN.use('util.list'); 
 
         function retrieve_row(params) {