From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 24 Jun 2019 15:59:36 +0000 (-0400)
Subject: JBAS-2256 Record bucket grid gets static columns
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=07c88c02ba07f002f90950ea9f08a62838260c09;p=working%2FEvergreen.git

JBAS-2256 Record bucket grid gets static columns

Work around issues with saving changes to auto-generated column lists in
the AngJS grid by defining a fixed set of columns for the 3 record
bucket grids.

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

diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2
index ec4473be20..cf50d27834 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2
@@ -3,7 +3,6 @@
   features="-sort,-multisort"
   id-field="id"
   idl-class="rmsr"
-  auto-fields="true"
   items-provider="gridDataProvider"
   menu-label="[% l('Buckets') %]"
   persist-key="cat.bucket.record.pending">
@@ -17,9 +16,20 @@
   <eg-grid-action label="[% l('Clear List') %]" 
     handler="resetPendingList"></eg-grid-action>
 
+  <eg-grid-field path="id" required hidden></eg-grid-field>
+  <eg-grid-field path="tcn_value" label="[% l('TCN Value') %]"></eg-grid-field>
+  <eg-grid-field path="tcn_source" label="[% l('TCN Source') %]"></eg-grid-field>
+
   <eg-grid-field label="[% l('Title') %]" path="title">
     <a target="_blank" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.id}}">
     {{item.title}} <span ng-show="item.id" class="glyphicon glyphicon-new-window"/>
     </a>
   </eg-grid-field>
+
+  <eg-grid-field path="author" label="[% l('Author') %]"></eg-grid-field>
+  <eg-grid-field path="pubdate" label="[% l('Publication Year') %]"></eg-grid-field>
+  <eg-grid-field path="isbn" label="[% l('ISBN') %]"></eg-grid-field>
+  <eg-grid-field path="issn" label="[% l('ISSN') %]"></eg-grid-field>
+  <eg-grid-field label="[% l('Deleted?') %]" path="biblio_record.deleted"></eg-grid-field>
+
 </eg-grid>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2
index 02506bc951..69d89149f8 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2
@@ -29,7 +29,6 @@
   ng-hide="forbidden"
   id-field="id"
   idl-class="rmsr"
-  auto-fields="true"
   grid-controls="gridControls"
   menu-label="[% l('Buckets') %]"
   persist-key="cat.bucket.record.search">
@@ -43,9 +42,20 @@
   <eg-grid-action label="[% l('Add To Bucket') %]" 
     handler="addToBucket"></eg-grid-action>
 
+  <eg-grid-field path="id" required hidden></eg-grid-field>
+  <eg-grid-field path="tcn_value" label="[% l('TCN Value') %]"></eg-grid-field>
+  <eg-grid-field path="tcn_source" label="[% l('TCN Source') %]"></eg-grid-field>
+
   <eg-grid-field label="[% l('Title') %]" path="title">
     <a target="_blank" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.id}}">
     {{item.title}} <span ng-show="item.id" class="glyphicon glyphicon-new-window"/>
     </a>
   </eg-grid-field>
+
+  <eg-grid-field path="author" label="[% l('Author') %]"></eg-grid-field>
+  <eg-grid-field path="pubdate" label="[% l('Publication Year') %]"></eg-grid-field>
+  <eg-grid-field path="isbn" label="[% l('ISBN') %]"></eg-grid-field>
+  <eg-grid-field path="issn" label="[% l('ISSN') %]"></eg-grid-field>
+  <eg-grid-field label="[% l('Deleted?') %]" path="biblio_record.deleted"></eg-grid-field>
+
 </eg-grid>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
index e20d50e1ab..e1ce676613 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
@@ -2,7 +2,6 @@
   ng-hide="forbidden"
   id-field="id"
   idl-class="rmsr"
-  auto-fields="true"
   grid-controls="gridControls"
   menu-label="[% l('Buckets') %]"
   persist-key="cat.bucket.record.view">
@@ -29,6 +28,8 @@
     handler="openExportBucketDialog"></eg-grid-action>
 
   <eg-grid-field path="id" required hidden></eg-grid-field>
+  <eg-grid-field path="tcn_value" label="[% l('TCN Value') %]"></eg-grid-field>
+  <eg-grid-field path="tcn_source" label="[% l('TCN Source') %]"></eg-grid-field>
 
   <eg-grid-field label="[% l('Title') %]" path="title">
     <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.id}}">
@@ -36,6 +37,11 @@
     </a>
   </eg-grid-field>
 
+  <eg-grid-field path="author" label="[% l('Author') %]"></eg-grid-field>
+  <eg-grid-field path="pubdate" label="[% l('Publication Year') %]"></eg-grid-field>
+  <eg-grid-field path="isbn" label="[% l('ISBN') %]"></eg-grid-field>
+  <eg-grid-field path="issn" label="[% l('ISSN') %]"></eg-grid-field>
+
   <eg-grid-field label="[% l('Deleted?') %]" path="biblio_record.deleted"></eg-grid-field>
 
   <!-- TODO: this adds much delay to call
diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
index 110ace13e5..4e01561bbe 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
@@ -540,8 +540,18 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
             // is not a full "mwde" object.  Instead it's a single
             // non-multi-field, JSON-encoded value.
             item['biblio_record.wide_display_entry.edition'] =
-                JSON.parse(item['biblio_record.wide_display_entry.edition'])
-                || '';
+                item['biblio_record.wide_display_entry.edition'] ?
+                JSON.parse(item['biblio_record.wide_display_entry.edition']) :
+                '';
+
+            // Clean up PG text[] cruft
+            if (item.isbn) {
+                item.isbn = item.isbn.replace(/(^\{|\}$)/g, '');
+            }
+
+            if (item.issn) {
+                item.issn = item.issn.replace(/(^\{|\}$)/g, '');
+            }
         }
     };