[open-ils-commits] [GIT] Evergreen ILS branch master updated. e6a1e7fdcfc20499f3094111e9039eb3f5d86dfe
Evergreen Git
git at git.evergreen-ils.org
Fri Mar 3 15:02:58 EST 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 e6a1e7fdcfc20499f3094111e9039eb3f5d86dfe (commit)
via 6d11be693ae8a56da95b802d21ba426477067d2e (commit)
via 40752570a0aa53a74408bba000679510784d0eee (commit)
from ceba7dd6341f45f87ec7750aa79c6b63bdb97c43 (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 e6a1e7fdcfc20499f3094111e9039eb3f5d86dfe
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Feb 22 15:14:27 2017 -0500
LP#1615845 Item status view columns aligned
Removes the redundant TCN value from the item status view so that the
columns can once again be vertically aligned. The TCN is visible in the
bib summary pane along the top.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
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 5935f87..345eb23 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
@@ -1,10 +1,3 @@
-<style>
-/* FIXME: move me */
-#item-status-alert-msg {
- flex:7; /* fill the remaining horizontal space */
-}
-</style>
-
<div class="">
<div class="flex-row">
@@ -138,9 +131,6 @@
</div>
<div class="flex-row">
- <div class="flex-cell">[% l('TCN') %]</div>
- <div class="flex-cell well">{{copy.call_number().record().tcn_value()}}</div>
-
<div class="flex-cell">[% l('Circulate') %]</div>
<div class="flex-cell well">{{copy.circulate()}}</div>
@@ -166,9 +156,6 @@
<div class="flex-cell">[% l('Age-based Hold Protection') %]</div>
<div class="flex-cell well">{{copy.age_protect().name()}}</div>
- <!-- empty -->
- <div class="flex-cell"></div>
- <div class="flex-cell"></div>
<div class="flex-cell">[% l('Checkin Workstation') %]</div>
<div class="flex-cell well">
@@ -179,9 +166,7 @@
<div class="flex-row">
<div class="flex-cell">[% l('Alert Message') %]</div>
- <div id="item-status-alert-msg" class="well">
- {{copy.alert_message()}}
- </div>
+ <div class="well" style="flex:7">{{copy.alert_message()}}</div>
</div>
</div>
commit 6d11be693ae8a56da95b802d21ba426477067d2e
Author: Kyle Huckins <khuckins at catalystdevworks.com>
Date: Mon Jan 9 13:15:54 2017 -0800
LP#1615845 In House Uses on Item Status
Display number of in-house uses in quick summary of item
status interface.
Signed-off-by: Kyle Huckins <khuckins at catalystdevworks.com>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
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 1ab16a5..5935f87 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
@@ -127,8 +127,8 @@
<div class="flex-cell">[% l('Holdable') %]</div>
<div class="flex-cell well">{{copy.opac_visible()}}</div>
- <div class="flex-cell">[% l('Renewal Workstation') %]</div>
- <div class="flex-cell well">{{circ_summary.last_renewal_workstation()}}</div>
+ <div class="flex-cell">[% l('In-House Uses') %]</div>
+ <div class="flex-cell well">{{copy._inHouseUseCount}}</div>
<div class="flex-cell">[% l('Checkin Time') %]</div>
<div class="flex-cell well">
@@ -144,6 +144,9 @@
<div class="flex-cell">[% l('Circulate') %]</div>
<div class="flex-cell well">{{copy.circulate()}}</div>
+ <div class="flex-cell">[% l('Renewal Workstation') %]</div>
+ <div class="flex-cell well">{{circ_summary.last_renewal_workstation()}}</div>
+
<div class="flex-cell">[% l('Remaining Renewals') %]</div>
<div class="flex-cell well">{{circ.renewal_remaining()}}</div>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index 5468daf..6e411ef 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -90,6 +90,13 @@ function(egCore) {
function(copy) {
var flatCopy;
+
+ egCore.pcrud.search('aihu',
+ {item : copy.id()}, {}, {idlist : true, atomic : true})
+ .then(function(uses) {
+ copy._inHouseUseCount = uses.length;
+ });
+
if (noListDupes) {
// use the existing copy if possible
flatCopy = service.copies.filter(
commit 40752570a0aa53a74408bba000679510784d0eee
Author: Bill Erickson <berickxx at gmail.com>
Date: Fri Jan 6 11:27:07 2017 -0500
LP#1615845 In-house-use permacrud IDL access
Grant permission-less retrieve access to open-ils.pcrud for "aihu"
and "ancihu" classes.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 6f722e0..2ec0f20 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2310,7 +2310,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<link field="field" reltype="has_a" key="id" map="" class="cmf"/>
</links>
</class>
- <class id="aihu" controller="open-ils.cstore" oils_obj:fieldmapper="action::in_house_use" oils_persist:tablename="action.in_house_use" reporter:core="true" reporter:label="In House Use">
+ <class id="aihu" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="action::in_house_use" oils_persist:tablename="action.in_house_use" reporter:core="true" reporter:label="In House Use">
<fields oils_persist:primary="id" oils_persist:sequence="action.in_house_use_id_seq">
<field reporter:label="Use ID" name="id" reporter:datatype="id" />
<field reporter:label="Item" name="item" reporter:datatype="int" />
@@ -2323,8 +2323,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<link field="staff" reltype="has_a" key="id" map="" class="au"/>
<link field="org_unit" reltype="has_a" key="id" map="" class="aou"/>
</links>
+ <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+ <actions>
+ <retrieve/>
+ </actions>
+ </permacrud>
</class>
- <class id="ancihu" controller="open-ils.cstore" oils_obj:fieldmapper="action::non_cat_in_house_use" oils_persist:tablename="action.non_cat_in_house_use" reporter:core="true" reporter:label="Non-cataloged In House Use">
+ <class id="ancihu" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="action::non_cat_in_house_use" oils_persist:tablename="action.non_cat_in_house_use" reporter:core="true" reporter:label="Non-cataloged In House Use">
<fields oils_persist:primary="id" oils_persist:sequence="action.non_cat_in_house_use_id_seq">
<field reporter:label="Use ID" name="id" reporter:datatype="id" />
<field reporter:label="Item Type" name="item_type" reporter:datatype="link"/>
@@ -2337,6 +2342,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<link field="staff" reltype="has_a" key="id" map="" class="au"/>
<link field="org_unit" reltype="has_a" key="id" map="" class="aou"/>
</links>
+ <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+ <actions>
+ <retrieve/>
+ </actions>
+ </permacrud>
</class>
<class id="atc" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="action::transit_copy" oils_persist:tablename="action.transit_copy" reporter:core="true" reporter:label="Copy Transit">
<fields oils_persist:primary="id" oils_persist:sequence="action.transit_copy_id_seq">
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 14 ++++++++++-
.../templates/staff/cat/item/t_summary_pane.tt2 | 24 +++++---------------
Open-ILS/web/js/ui/default/staff/cat/item/app.js | 7 +++++
3 files changed, 25 insertions(+), 20 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list