From 6b28350cf1e091b9542127084c7e068903ceef66 Mon Sep 17 00:00:00 2001
From: Michele Morgan <mmorgan@noblenet.org>
Date: Tue, 27 Aug 2019 08:55:06 -0400
Subject: [PATCH] LP1811466 Add fields to holdings editor column pickers

Adds item fields creator, editor and last edit date to the working and
completed grids in the holdings editor.

Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Rogan Hamby <rogan.hamby@gmail.com>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---
 Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 | 12 +++++++++---
 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
index 7a923ffc9f..dd383c00a9 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -128,10 +128,13 @@
 
                           <eg-grid-field label="[% l('Barcode') %]"     path='barcode' visible></eg-grid-field>
                           <eg-grid-field label="[% l('Created') %]"     path="create_date" datatype="timestamp" visible></eg-grid-field>
+                          <eg-grid-field label="[% l('Creator') %]"     path="creator.usrname" visible></eg-grid-field>
                           <eg-grid-field label="[% l('Activated') %]"   path="active_date" visible></eg-grid-field>
-                          <eg-grid-field label="[% l('CN Prefix') %]" path="call_number.prefix.label" visible></eg-grid-field>
-                          <eg-grid-field label="[% l('Call Number') %]" path="call_number.label" visible></eg-grid-field>
-                          <eg-grid-field label="[% l('CN Suffix') %]" path="call_number.suffix.label" visible></eg-grid-field>
+                          <eg-grid-field label="[% l('Edited') %]"      path="edit_date" datatype="timestamp" visible></eg-grid-field>
+                          <eg-grid-field label="[% l('Editor') %]"      path="editor.usrname" visible></eg-grid-field>
+                          <eg-grid-field label="[% l('CN Prefix') %]"   path="call_number.prefix.label" hidden></eg-grid-field>
+                          <eg-grid-field label="[% l('Call Number') %]" path="call_number.label" hidden></eg-grid-field>
+                          <eg-grid-field label="[% l('CN Suffix') %]"   path="call_number.suffix.label" hidden></eg-grid-field>
                           <eg-grid-field label="[% l('Item ID') %]"     path="id" hidden></eg-grid-field>
 
                         </eg-grid>
@@ -161,7 +164,10 @@
 
                  <eg-grid-field label="[% l('Barcode') %]"     path='barcode' visible></eg-grid-field>
                  <eg-grid-field label="[% l('Created') %]"     path="create_date" datatype="timestamp" visible></eg-grid-field>
+                 <eg-grid-field label="[% l('Creator') %]"     path="creator.usrname" visible></eg-grid-field>
                  <eg-grid-field label="[% l('Activated') %]"   path="active_date" datatype="timestamp" visible></eg-grid-field>
+                 <eg-grid-field label="[% l('Edited') %]"      path="edit_date" datatype="timestamp" visible></eg-grid-field>
+                 <eg-grid-field label="[% l('Editor') %]"      path="editor.usrname" visible></eg-grid-field>
                  <eg-grid-field label="[% l('Call Number') %]" path="call_number.label" visible></eg-grid-field>
                  <eg-grid-field label="[% l('Circ Library') %]" flesher="orgById" path="circ_lib.name" visible></eg-grid-field>
                  <eg-grid-field label="[% l('Shelving Location') %]" flesher="locationById" path="location.name" visible></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index 9acfc13473..3e0b8188c3 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -384,7 +384,7 @@ function(egCore , $q) {
     service.flesh = {   
         flesh : 3, 
         flesh_fields : {
-            acp : ['call_number','parts','stat_cat_entries', 'notes', 'tags'],
+            acp : ['call_number','parts','stat_cat_entries', 'notes', 'tags', 'creator', 'editor'],
             acn : ['label_class','prefix','suffix'],
             acptcm : ['tag']
         }
-- 
2.11.0