[open-ils-commits] [GIT] Evergreen ILS branch master updated. 972202ac8e627ca370989dc2408aa41cf794203e
Evergreen Git
git at git.evergreen-ils.org
Mon Jul 3 13:57:05 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 972202ac8e627ca370989dc2408aa41cf794203e (commit)
via f6a1851c7ba9d4897e4579055e67d82a5399752b (commit)
via dada0a559f26746a32cb9d219576dcd64182a5bb (commit)
via 5a42920f57775bf7c7059457c3e9ad3deddbe335 (commit)
via 36308204b8c311602173fa6a606ac7275c53c47f (commit)
via 1fecb8a6d71da23a319382cdbcd47a2a13aefa2c (commit)
via 16f2447321c3c28fe2a8f8206467c6740dcb3359 (commit)
via bebc5dc53a89d342b621216b4cc66d8c3e77e76d (commit)
from 62e4bb2d85d40d410d0a9b34664dcc8723286f2c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 972202ac8e627ca370989dc2408aa41cf794203e
Author: Jason Etheridge <jason at equinoxinitiative.org>
Date: Mon Jul 3 13:47:25 2017 -0400
lp1661685 fix circ lib in patron holds list
and make it and the circ modifier column hidden by default
Signed-off-by: Jason Etheridge <jason at equinoxinitiative.org>
Signed-off-by: Andrea Neiman <abneiman at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index c59c43e..286b7ec 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -53,10 +53,8 @@
</a>
</eg-grid-field>
- <eg-grid-field label="[% l('Circulation Modifier') %]" path="hold.current_copy.circ_modifier">
- {{item.hold.current_copy().circ_modifier()}}</eg-grid-field>
- <eg-grid-field label="[% l('Circulation Library') %]" path="hold.current_copy.circ_lib">
- {{item.hold.current_copy().circ_lib().shortname()}}</eg-grid-field>
+ <eg-grid-field label="[% l('Circulation Modifier') %]" path="copy.circ_modifier" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Circulation Library') %]" path="copy.circ_lib.shortname" hidden></eg-grid-field>
<eg-grid-field label="[% l('Patron Barcode') %]" path="patron_barcode" hidden>{{item.patron_barcode}}</eg-grid-field>
<eg-grid-field label="[% l('Patron alias') %]" path="patron_alias" hidden>{{item.patron_alias}}</eg-grid-field>
<eg-grid-field label="[% l('Request Date') %]" path='hold.request_time' datatype="timestamp"></eg-grid-field>
commit f6a1851c7ba9d4897e4579055e67d82a5399752b
Author: Jason Etheridge <jason at equinoxinitiative.org>
Date: Fri Jun 30 16:45:30 2017 -0400
lp1661685 webstaff: Circ Lib column for Items Out
Signed-off-by: Jason Etheridge <jason at equinoxinitiative.org>
Signed-off-by: Andrea Neiman <abneiman at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index 01edcab..c80c4b6 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -84,7 +84,8 @@
<eg-grid-field label="[% l('Workstation') %]" path='workstation.name'></eg-grid-field>
<eg-grid-field label="[% l('Checkin Workstation') %]" path='checkin_workstation.name'></eg-grid-field>
<eg-grid-field label="[% l('Checkout / Renewal Library') %]" path='circ_lib.shortname'></eg-grid-field>
- <eg-grid-field label="[% l('Owning Library') %]" path='target_copy.call_number.owning_lib.shortname'></eg-grid-field>
+ <eg-grid-field label="[% l('Circulation Library') %]" path='target_copy.circ_lib.shortname' hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Owning Library') %]" path='target_copy.call_number.owning_lib.shortname' hidden></eg-grid-field>
<eg-grid-field label="[% l('Renewals Remaining') %]" path='renewal_remaining'></eg-grid-field>
<eg-grid-field label="[% l('Fines Stopped') %]" path='stop_fines'></eg-grid-field>
<eg-grid-field label="[% l('Title') %]" path="target_copy.call_number.record.simple_record.title" name="title">
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
index 2f9692f..c863194 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
@@ -106,7 +106,7 @@ function($scope, $q, $routeParams, $timeout, egCore , egUser, patronSvc , $
{ flesh : 4,
flesh_fields : {
circ : ['target_copy', 'workstation', 'checkin_workstation'],
- acp : ['call_number', 'holds_count', 'status'],
+ acp : ['call_number', 'holds_count', 'status', 'circ_lib'],
acn : ['record', 'owning_lib'],
bre : ['simple_record']
},
commit dada0a559f26746a32cb9d219576dcd64182a5bb
Author: Jason Etheridge <jason at equinoxinitiative.org>
Date: Wed Jun 28 14:58:37 2017 -0400
lp1661685 webstaff: Fix Owning Lib in Item Status
Detail View
Signed-off-by: Jason Etheridge <jason at equinoxinitiative.org>
Signed-off-by: Andrea Neiman <abneiman at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
index 9c60191..a80e4d8 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
@@ -28,7 +28,7 @@
<div class="flex-cell well">{{copy.price()}}</div>
<div class="flex-cell">[% l('Owning Library') %]</div>
- <div class="flex-cell well">{{copy.circ_lib().shortname()}}</div>
+ <div class="flex-cell well">{{copy.call_number().owning_lib().shortname()}}</div>
<div class="flex-cell">[% l('Call #') %]</div>
<div class="flex-cell well">{{copy.call_number().label()}}</div>
commit 5a42920f57775bf7c7059457c3e9ad3deddbe335
Author: Jason Etheridge <jason at equinoxinitiative.org>
Date: Wed Jun 28 14:41:53 2017 -0400
lp1661685 fieldmapper label change for circ
Change "Circulation Library" to "Checkout / Renewal Library"
Signed-off-by: Jason Etheridge <jason at equinoxinitiative.org>
Signed-off-by: Andrea Neiman <abneiman at equinoxinitiative.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index b5e383d..fca38b5 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -4156,7 +4156,7 @@ SELECT usr,
<field reporter:label="Check In Library" name="checkin_lib" reporter:datatype="org_unit"/>
<field reporter:label="Check In Staff" name="checkin_staff" reporter:datatype="link"/>
<field reporter:label="Check In Date/Time" name="checkin_time" reporter:datatype="timestamp"/>
- <field reporter:label="Circulating Library" name="circ_lib" reporter:datatype="org_unit"/>
+ <field reporter:label="Checkout / Renewal Library" name="circ_lib" reporter:datatype="org_unit"/>
<field reporter:label="Circulating Staff" name="circ_staff" reporter:datatype="link"/>
<field reporter:label="Desk Renewal" name="desk_renewal" reporter:datatype="bool"/>
<field reporter:label="Due Date/Time" name="due_date" reporter:datatype="timestamp"/>
commit 36308204b8c311602173fa6a606ac7275c53c47f
Author: Jason Etheridge <jason at equinoxinitiative.org>
Date: Wed Jun 28 14:40:02 2017 -0400
lp1661685 webstaff: add money.grocery to pcrud
and add a single column called Location to the Bills interface which shows
either the circ.circ_lib or the grocery.billing_location for a given xact
and the specific columns for both xact types
Signed-off-by: Jason Etheridge <jason at equinoxinitiative.org>
Signed-off-by: Andrea Neiman <abneiman at equinoxinitiative.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 00734a8..b5e383d 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -6500,7 +6500,7 @@ SELECT usr,
<link field="usr" reltype="has_a" key="id" map="" class="au"/>
</links>
</class>
- <class id="mg" controller="open-ils.cstore" oils_obj:fieldmapper="money::grocery" oils_persist:tablename="money.grocery" reporter:label="Grocery Transaction">
+ <class id="mg" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="money::grocery" oils_persist:tablename="money.grocery" reporter:label="Grocery Transaction">
<fields oils_persist:primary="id" oils_persist:sequence="money.billable_xact_id_seq">
<field reporter:label="Billing Location" name="billing_location" reporter:datatype="link"/>
<field reporter:label="Transaction ID" name="id" reporter:datatype="id" />
@@ -6523,6 +6523,11 @@ SELECT usr,
<link field="billing_total" reltype="might_have" key="xact" map="" class="rxbt"/>
<link field="payment_total" reltype="might_have" key="xact" map="" class="rxpt"/>
</links>
+ <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+ <actions>
+ <retrieve permission="VIEW_USER_TRANSACTIONS" context_field="billing_location"/>
+ </actions>
+ </permacrud>
</class>
<class id="cbs" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="config::bib_source" oils_persist:tablename="config.bib_source" reporter:label="Bib Source">
<fields oils_persist:primary="id" oils_persist:sequence="config.bib_source_id_seq">
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
index db1d85c..68511ad 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
@@ -79,11 +79,15 @@
</eg-grid-field>
<eg-grid-field path="circulation.target_copy.circ_modifier"
- label="[% l('Circulation Modifier') %]" name="circ_modifier">
+ label="[% l('Circulation Modifier') %]" name="circ_modifier" hidden>
</eg-grid-field>
<eg-grid-field path="circulation.target_copy.circ_lib.shortname"
- label="[% l('Circulation Library') %]" name="circ_lib">
+ label="[% l('Circulation Library') %]" name="circ_lib" hidden>
+ </eg-grid-field>
+
+ <eg-grid-field label="[% l('Location') %]" name="xact_location">
+ {{item['grocery.billing_location.shortname']||item['circulation.circ_lib.shortname']}}
</eg-grid-field>
<!-- virtual field -->
@@ -91,7 +95,12 @@
name="payment_pending"></eg-grid-field>
<!-- import all circ fields, hidden by default -->
+ <eg-grid-field path='grocery.*' hidden> </eg-grid-field>
+ <eg-grid-field label="[% l('Billing Location') %]"
+ path='grocery.billing_location.shortname' required hidden> </eg-grid-field>
<eg-grid-field path='circulation.*' hidden> </eg-grid-field>
+ <eg-grid-field label="[% l('Checkout / Renewal Library') %]"
+ path='circulation.circ_lib.shortname' required hidden> </eg-grid-field>
<eg-grid-field path='circulation.target_copy.*' hidden> </eg-grid-field>
commit 1fecb8a6d71da23a319382cdbcd47a2a13aefa2c
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Thu Jun 15 11:30:48 2017 -0400
LP#1685933 - Add Owning Library column to grids in ItemsOut and checkout views
Added necessary fleshing in egCirc service and items out to get acn.owning_lib.shortname
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Jason Etheridge <jason at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index c9c59bb..57f4b45 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -109,6 +109,7 @@
path="author" hidden></eg-grid-field>
<eg-grid-field path="acp.circ_modifier.name" label="[% l('Circulation Modifier') %]"></eg-grid-field>
<eg-grid-field path="acp.circ_lib.shortname" label="[% l('Circulation Library') %]"></eg-grid-field>
+ <eg-grid-field path="acn.owning_lib.shortname" label="[% l('Owning Library') %]"></eg-grid-field>
<eg-grid-field path="circ.*" parent-idl-class="circ" hidden></eg-grid-field>
<eg-grid-field path="acp.*" parent-idl-class="acp" hidden></eg-grid-field>
<eg-grid-field path="acn.*" parent-idl-class="acn" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index c8b0d1f..01edcab 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -84,6 +84,7 @@
<eg-grid-field label="[% l('Workstation') %]" path='workstation.name'></eg-grid-field>
<eg-grid-field label="[% l('Checkin Workstation') %]" path='checkin_workstation.name'></eg-grid-field>
<eg-grid-field label="[% l('Checkout / Renewal Library') %]" path='circ_lib.shortname'></eg-grid-field>
+ <eg-grid-field label="[% l('Owning Library') %]" path='target_copy.call_number.owning_lib.shortname'></eg-grid-field>
<eg-grid-field label="[% l('Renewals Remaining') %]" path='renewal_remaining'></eg-grid-field>
<eg-grid-field label="[% l('Fines Stopped') %]" path='stop_fines'></eg-grid-field>
<eg-grid-field label="[% l('Title') %]" path="target_copy.call_number.record.simple_record.title" name="title">
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
index be77ab2..2f9692f 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
@@ -107,7 +107,7 @@ function($scope, $q, $routeParams, $timeout, egCore , egUser, patronSvc , $
flesh_fields : {
circ : ['target_copy', 'workstation', 'checkin_workstation'],
acp : ['call_number', 'holds_count', 'status'],
- acn : ['record'],
+ acn : ['record', 'owning_lib'],
bre : ['simple_record']
},
// avoid fetching the MARC blob by specifying which
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 00dc293..3ec7822 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -536,9 +536,10 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
var promises = [];
var payload;
if (!evt[0] || !(payload = evt[0].payload)) return $q.when();
-
+
promises.push(service.flesh_copy_location(payload.copy));
if (payload.copy) {
+ promises.push(service.flesh_acn_owning_lib(payload.volume));
promises.push(service.flesh_copy_circ_library(payload.copy));
promises.push(service.flesh_copy_circ_modifier(payload.copy));
promises.push(
@@ -594,6 +595,11 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
return $q.all(promises);
}
+ service.flesh_acn_owning_lib = function(acn) {
+ if (!acn) return $q.when();
+ return $q.when(acn.owning_lib(egCore.org.get( acn.owning_lib() )));
+ }
+
service.flesh_copy_circ_library = function(copy) {
if (!copy) return $q.when();
commit 16f2447321c3c28fe2a8f8206467c6740dcb3359
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Wed Jun 14 17:14:14 2017 -0400
LP#1661685 - Adds circ library column to staff webclient grids
Circulation Library was missing as an option from several grids
Added also function to flesh out circ_lib.shortname to display name.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Jason Etheridge <jason at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
index e14f117..0ccf9e4 100644
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
@@ -79,6 +79,7 @@
path="acn.label" hidden></eg-grid-field>
<eg-grid-field path="acp.circ_modifier.name" label="[% l('Circulation Modifier') %]"></eg-grid-field>
+ <eg-grid-field path="acp.circ_lib.shortname" label="[% l('Circulation Library') %]"></eg-grid-field>
<eg-grid-field path="circ.*" parent-idl-class="circ" hidden></eg-grid-field>
<eg-grid-field path="acp.*" parent-idl-class="acp" hidden></eg-grid-field>
<eg-grid-field path="acn.*" parent-idl-class="acn" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
index b83196f..db1d85c 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
@@ -81,6 +81,11 @@
<eg-grid-field path="circulation.target_copy.circ_modifier"
label="[% l('Circulation Modifier') %]" name="circ_modifier">
</eg-grid-field>
+
+ <eg-grid-field path="circulation.target_copy.circ_lib.shortname"
+ label="[% l('Circulation Library') %]" name="circ_lib">
+ </eg-grid-field>
+
<!-- virtual field -->
<eg-grid-field datatype="money" label="[% ('Payment Pending') %]"
name="payment_pending"></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index da17142..c9c59bb 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -108,6 +108,7 @@
<eg-grid-field label="[% l('Author') %]"
path="author" hidden></eg-grid-field>
<eg-grid-field path="acp.circ_modifier.name" label="[% l('Circulation Modifier') %]"></eg-grid-field>
+ <eg-grid-field path="acp.circ_lib.shortname" label="[% l('Circulation Library') %]"></eg-grid-field>
<eg-grid-field path="circ.*" parent-idl-class="circ" hidden></eg-grid-field>
<eg-grid-field path="acp.*" parent-idl-class="acp" hidden></eg-grid-field>
<eg-grid-field path="acn.*" parent-idl-class="acn" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index ec975ae..c59c43e 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -55,6 +55,8 @@
<eg-grid-field label="[% l('Circulation Modifier') %]" path="hold.current_copy.circ_modifier">
{{item.hold.current_copy().circ_modifier()}}</eg-grid-field>
+ <eg-grid-field label="[% l('Circulation Library') %]" path="hold.current_copy.circ_lib">
+ {{item.hold.current_copy().circ_lib().shortname()}}</eg-grid-field>
<eg-grid-field label="[% l('Patron Barcode') %]" path="patron_barcode" hidden>{{item.patron_barcode}}</eg-grid-field>
<eg-grid-field label="[% l('Patron alias') %]" path="patron_alias" hidden>{{item.patron_alias}}</eg-grid-field>
<eg-grid-field label="[% l('Request Date') %]" path='hold.request_time' datatype="timestamp"></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js b/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js
index 1e51cde..41e0223 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js
@@ -58,6 +58,7 @@ function($scope, $q, $routeParams, egCore, egUser, patronSvc,
//var ids = patronSvc.hold_ids.slice(offset, offset + count);
return egHolds.fetch_holds(patronSvc.hold_ids).then(null, null,
function(hold_data) {
+ egCirc.flesh_copy_circ_library(hold_data.copy);
patronSvc.holds.push(hold_data);
return hold_data;
}
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index baf79c9..00dc293 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -121,7 +121,6 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
// options : non-parameter controls. e.g. "override", "check_barcode"
service.checkout = function(params, options) {
if (!options) options = {};
-
console.debug('egCirc.checkout() : '
+ js2JSON(params) + ' : ' + js2JSON(options));
@@ -540,6 +539,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
promises.push(service.flesh_copy_location(payload.copy));
if (payload.copy) {
+ promises.push(service.flesh_copy_circ_library(payload.copy));
promises.push(service.flesh_copy_circ_modifier(payload.copy));
promises.push(
service.flesh_copy_status(payload.copy)
@@ -594,6 +594,12 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
return $q.all(promises);
}
+ service.flesh_copy_circ_library = function(copy) {
+ if (!copy) return $q.when();
+
+ return $q.when(copy.circ_lib(egCore.org.get( copy.circ_lib() )));
+ }
+
// fetches the full list of circ modifiers
service.flesh_copy_circ_modifier = function(copy) {
if (!copy) return $q.when();
commit bebc5dc53a89d342b621216b4cc66d8c3e77e76d
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Fri Jun 9 17:36:16 2017 -0400
LP#1661685 - Adds missing Circulation Modifier column to several grids
Some views like the Checkout,CheckIn, Holds, And Bills
did not display the copy's circ_modifier field.
Also added egCirc.flesh_copy_circ_modifier()
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Jason Etheridge <jason at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
index 920ee2b..e14f117 100644
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
@@ -78,6 +78,7 @@
<eg-grid-field label="[% l('Call Number') %]"
path="acn.label" hidden></eg-grid-field>
+ <eg-grid-field path="acp.circ_modifier.name" label="[% l('Circulation Modifier') %]"></eg-grid-field>
<eg-grid-field path="circ.*" parent-idl-class="circ" hidden></eg-grid-field>
<eg-grid-field path="acp.*" parent-idl-class="acp" hidden></eg-grid-field>
<eg-grid-field path="acn.*" parent-idl-class="acn" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
index 6d176be..b83196f 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
@@ -78,6 +78,9 @@
label="[% l('Copy ID') %]" name="copy_id" required hidden>
</eg-grid-field>
+ <eg-grid-field path="circulation.target_copy.circ_modifier"
+ label="[% l('Circulation Modifier') %]" name="circ_modifier">
+ </eg-grid-field>
<!-- virtual field -->
<eg-grid-field datatype="money" label="[% ('Payment Pending') %]"
name="payment_pending"></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index 3210a53..da17142 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -107,7 +107,7 @@
<eg-grid-field label="[% l('Author') %]"
path="author" hidden></eg-grid-field>
-
+ <eg-grid-field path="acp.circ_modifier.name" label="[% l('Circulation Modifier') %]"></eg-grid-field>
<eg-grid-field path="circ.*" parent-idl-class="circ" hidden></eg-grid-field>
<eg-grid-field path="acp.*" parent-idl-class="acp" hidden></eg-grid-field>
<eg-grid-field path="acn.*" parent-idl-class="acn" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index 5fa3b96..ec975ae 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -53,6 +53,8 @@
</a>
</eg-grid-field>
+ <eg-grid-field label="[% l('Circulation Modifier') %]" path="hold.current_copy.circ_modifier">
+ {{item.hold.current_copy().circ_modifier()}}</eg-grid-field>
<eg-grid-field label="[% l('Patron Barcode') %]" path="patron_barcode" hidden>{{item.patron_barcode}}</eg-grid-field>
<eg-grid-field label="[% l('Patron alias') %]" path="patron_alias" hidden>{{item.patron_alias}}</eg-grid-field>
<eg-grid-field label="[% l('Request Date') %]" path='hold.request_time' datatype="timestamp"></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index c217f25..baf79c9 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -540,6 +540,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
promises.push(service.flesh_copy_location(payload.copy));
if (payload.copy) {
+ promises.push(service.flesh_copy_circ_modifier(payload.copy));
promises.push(
service.flesh_copy_status(payload.copy)
@@ -593,6 +594,19 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
return $q.all(promises);
}
+ // fetches the full list of circ modifiers
+ service.flesh_copy_circ_modifier = function(copy) {
+ if (!copy) return $q.when();
+ if (egCore.env.ccm)
+ return $q.when(copy.circ_modifier(egCore.env.ccm.map[copy.circ_modifier()]));
+ return egCore.pcrud.retrieveAll('ccm', {}, {atomic : true}).then(
+ function(list) {
+ egCore.env.absorbList(list, 'ccm');
+ copy.circ_modifier(egCore.env.ccm.map[copy.circ_modifier()]);
+ }
+ );
+ }
+
// fetches the full list of copy statuses
service.flesh_copy_status = function(copy) {
if (!copy) return $q.when();
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 9 ++++-
.../templates/staff/cat/item/t_summary_pane.tt2 | 2 +-
.../staff/circ/checkin/t_checkin_table.tt2 | 2 +
.../templates/staff/circ/patron/t_bills_list.tt2 | 17 +++++++++++
.../src/templates/staff/circ/patron/t_checkout.tt2 | 4 ++-
.../templates/staff/circ/patron/t_holds_list.tt2 | 2 +
.../templates/staff/circ/patron/t_items_out.tt2 | 2 +
.../web/js/ui/default/staff/circ/patron/holds.js | 1 +
.../js/ui/default/staff/circ/patron/items_out.js | 4 +-
.../web/js/ui/default/staff/circ/services/circ.js | 30 ++++++++++++++++++-
10 files changed, 65 insertions(+), 8 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list