[open-ils-commits] [GIT] Evergreen ILS branch master updated. 6c17e1fa71115cea86399c6bf9e2f560c77a6bd7
Evergreen Git
git at git.evergreen-ils.org
Tue Nov 7 11:08:04 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 6c17e1fa71115cea86399c6bf9e2f560c77a6bd7 (commit)
via 8265ffd65af494a471f0ce35e3f8895141290777 (commit)
via 346c9ed47077616d5c6489c12c23e2efa49fb80e (commit)
from 2e697a09bc83f4fd2dfc1ab7aae7fbcdf43a2992 (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 6c17e1fa71115cea86399c6bf9e2f560c77a6bd7
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Fri Oct 20 16:57:23 2017 -0400
LP#1679246 - add display-none css rule to eg-grid-field
This will fix the extraneous text created from any
eg-grid-field that has non IDL paths or text data.
Ex: a virtual/computed column, ie {{usr}}@{{org}}
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index e5a661a..74cf439 100644
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -473,6 +473,10 @@ table.list tr.selected td { /* deprecated? */
height: 25px;
}
+eg-grid-field {
+ display: none;
+}
+
[%#
vim: ft=css
%]
commit 8265ffd65af494a471f0ce35e3f8895141290777
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Nov 7 10:59:09 2017 -0500
LP#1679246: (follow-up) restore local whitespace consistency
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 8750cfe..6b763dd 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -7626,10 +7626,10 @@ SELECT usr,
<link field="accepting_usr" reltype="has_a" key="id" map="" class="au"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
- <actions>
- <retrieve permission="VIEW_USER_TRANSACTIONS">
- <context link="xact" jump="usr" field="home_ou"/>
- </retrieve>
+ <actions>
+ <retrieve permission="VIEW_USER_TRANSACTIONS">
+ <context link="xact" jump="usr" field="home_ou"/>
+ </retrieve>
</actions>
</permacrud>
</class>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
index 8a8057c..fdab723 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
@@ -130,36 +130,36 @@
<!-- NOTE: sorting disabled since payments are fetched via non-sortable API -->
<br/>
<eg-grid
- main-label="[% l('Payments') %]"
- idl-class="mbp"
- id-field="id"
- grid-controls="paymentGridControls"
- page-size="10"
- dateformat="{{$root.egDateAndTimeFormat}}">
- <eg-grid-action
- label="[% l('Edit Note') %]" handler="editPaymentNotes"></eg-grid-action>
-
-<eg-grid-field path="cash_payment.cash_drawer.name" parent-idl-class="mbp"
- label="[% l('Cash Drawer') %]"></eg-grid-field>
-
- <eg-grid-field path="accepting_usr">{{item.staff_name}} ({{item.staff_barcode}}) @ {{item.staff_org}}</eg-grid-field>
-
- <eg-grid-field path="amount"></eg-grid-field>
- <eg-grid-field path="id"></eg-grid-field>
- <eg-grid-field path="note"></eg-grid-field>
- <eg-grid-field path="payment_ts"></eg-grid-field>
- <eg-grid-field path="payment_type"></eg-grid-field>
- <eg-grid-field path="xact"></eg-grid-field>
- <eg-grid-field path="voided"></eg-grid-field>
-
- <eg-grid-field path="accepting_usr.family_name" name="staff_name"
- label="[% l('Staff Last Name') %]" hidden required></eg-grid-field>
-
- <eg-grid-field path="accepting_usr.card.barcode" name="staff_barcode"
- label="[% l('Staff Barcode') %]" hidden required></eg-grid-field>
-
- <eg-grid-field path="accepting_usr.home_ou.shortname" name="staff_org"
- label="[% l('Staff Org Unit') %]" hidden required></eg-grid-field>
+ main-label="[% l('Payments') %]"
+ idl-class="mbp"
+ id-field="id"
+ grid-controls="paymentGridControls"
+ page-size="10"
+ dateformat="{{$root.egDateAndTimeFormat}}">
+ <eg-grid-action
+ label="[% l('Edit Note') %]" handler="editPaymentNotes"></eg-grid-action>
+
+ <eg-grid-field path="cash_payment.cash_drawer.name" parent-idl-class="mbp"
+ label="[% l('Cash Drawer') %]"></eg-grid-field>
+
+ <eg-grid-field path="accepting_usr">{{item.staff_name}} ({{item.staff_barcode}}) @ {{item.staff_org}}</eg-grid-field>
+
+ <eg-grid-field path="amount"></eg-grid-field>
+ <eg-grid-field path="id"></eg-grid-field>
+ <eg-grid-field path="note"></eg-grid-field>
+ <eg-grid-field path="payment_ts"></eg-grid-field>
+ <eg-grid-field path="payment_type"></eg-grid-field>
+ <eg-grid-field path="xact"></eg-grid-field>
+ <eg-grid-field path="voided"></eg-grid-field>
+
+ <eg-grid-field path="accepting_usr.family_name" name="staff_name"
+ label="[% l('Staff Last Name') %]" hidden required></eg-grid-field>
+
+ <eg-grid-field path="accepting_usr.card.barcode" name="staff_barcode"
+ label="[% l('Staff Barcode') %]" hidden required></eg-grid-field>
+
+ <eg-grid-field path="accepting_usr.home_ou.shortname" name="staff_org"
+ label="[% l('Staff Org Unit') %]" hidden required></eg-grid-field>
</eg-grid>
commit 346c9ed47077616d5c6489c12c23e2efa49fb80e
Author: Skye Howard <showard at catalyte.io>
Date: Tue Oct 10 20:58:45 2017 +0000
LP#1679246: Patron billing add staff user
Added column to match XUL client of 'Accepting User' to display
username(barcode) @ home org unit
Signed-off-by: Alex Cautley <acautley at catalyte.io>
modified: Open-ILS/examples/fm_IDL.xml
modified: Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 4e4e969..8750cfe 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -7594,7 +7594,7 @@ SELECT usr,
</actions>
</permacrud>
</class>
- <class id="mbp" controller="open-ils.cstore" oils_obj:fieldmapper="money::bnm_payment" oils_persist:tablename="money.bnm_payment_view" reporter:core="true" reporter:label="Payments: Brick-and-mortar">
+ <class id="mbp" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="money::bnm_payment" oils_persist:tablename="money.bnm_payment_view" reporter:core="true" reporter:label="Payments: Brick-and-mortar">
<fields oils_persist:primary="id" oils_persist:sequence="">
<field reporter:label="Amount" name="amount" reporter:datatype="money" />
<field reporter:label="Payment ID" name="id" reporter:datatype="id" />
@@ -7625,6 +7625,13 @@ SELECT usr,
<link field="xact" reltype="has_a" key="id" map="" class="mbt"/>
<link field="accepting_usr" reltype="has_a" key="id" map="" class="au"/>
</links>
+ <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+ <actions>
+ <retrieve permission="VIEW_USER_TRANSACTIONS">
+ <context link="xact" jump="usr" field="home_ou"/>
+ </retrieve>
+ </actions>
+ </permacrud>
</class>
<class id="mndp" controller="open-ils.reporter" oils_obj:fieldmapper="money::non_drawer_payment" oils_persist:tablename="money.non_drawer_payment_view" reporter:core="true" reporter:label="Payments: Non-drawer Staff">
<fields oils_persist:primary="id" oils_persist:sequence="">
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
index 032a726..8a8057c 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
@@ -130,18 +130,36 @@
<!-- NOTE: sorting disabled since payments are fetched via non-sortable API -->
<br/>
<eg-grid
- main-label="[% l('Payments') %]"
- idl-class="mp"
- id-field="id"
- auto-fields="true"
- grid-controls="paymentGridControls"
- page-size="10"
- dateformat="{{$root.egDateAndTimeFormat}}">
- <eg-grid-action
- label="[% l('Edit Note') %]" handler="editPaymentNotes"></eg-grid-action>
+ main-label="[% l('Payments') %]"
+ idl-class="mbp"
+ id-field="id"
+ grid-controls="paymentGridControls"
+ page-size="10"
+ dateformat="{{$root.egDateAndTimeFormat}}">
+ <eg-grid-action
+ label="[% l('Edit Note') %]" handler="editPaymentNotes"></eg-grid-action>
+
+<eg-grid-field path="cash_payment.cash_drawer.name" parent-idl-class="mbp"
+ label="[% l('Cash Drawer') %]"></eg-grid-field>
+
+ <eg-grid-field path="accepting_usr">{{item.staff_name}} ({{item.staff_barcode}}) @ {{item.staff_org}}</eg-grid-field>
+
+ <eg-grid-field path="amount"></eg-grid-field>
+ <eg-grid-field path="id"></eg-grid-field>
+ <eg-grid-field path="note"></eg-grid-field>
+ <eg-grid-field path="payment_ts"></eg-grid-field>
+ <eg-grid-field path="payment_type"></eg-grid-field>
+ <eg-grid-field path="xact"></eg-grid-field>
+ <eg-grid-field path="voided"></eg-grid-field>
+
+ <eg-grid-field path="accepting_usr.family_name" name="staff_name"
+ label="[% l('Staff Last Name') %]" hidden required></eg-grid-field>
+
+ <eg-grid-field path="accepting_usr.card.barcode" name="staff_barcode"
+ label="[% l('Staff Barcode') %]" hidden required></eg-grid-field>
- <eg-grid-field path="cash_payment.cash_drawer.name"
- label="[% l('Cash Drawer') %]"></eg-grid-field>
+ <eg-grid-field path="accepting_usr.home_ou.shortname" name="staff_org"
+ label="[% l('Staff Org Unit') %]" hidden required></eg-grid-field>
</eg-grid>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 9 ++++++-
.../templates/staff/circ/patron/t_xact_details.tt2 | 26 ++++++++++++++++---
Open-ILS/src/templates/staff/css/style.css.tt2 | 4 +++
3 files changed, 34 insertions(+), 5 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list