[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. 7c8fd7935cfdfe84a0e8126e818c7b30cdd75575
Evergreen Git
git at git.evergreen-ils.org
Thu Jan 11 10:23:34 EST 2018
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, rel_3_0 has been updated
via 7c8fd7935cfdfe84a0e8126e818c7b30cdd75575 (commit)
via e7e3ae65e2f5abd5f4da9378fb1f08ee46747c9c (commit)
from 9f71b6a134458a8908680322e8b3149f5afd4d9c (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 7c8fd7935cfdfe84a0e8126e818c7b30cdd75575
Author: Bill Erickson <berickxx at gmail.com>
Date: Mon Jan 8 10:37:17 2018 -0500
LP#1741072 Volcopy editor deposit amount format repairs
Use the new str-to-float formatter for deposit amount, consistent with
the other currency fields.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index 8b61610..5b9181e 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -320,7 +320,7 @@
</div>
</div>
<div class="col-md-6" ng-class="{'bg-success': working.deposit_amount !== undefined}">
- <input class="form-control" ng-disabled="!defaults.attributes.deposit_amount" string-to-number ng-model="working.deposit_amount" type="number" step="0.01"/>
+ <input class="form-control" ng-disabled="!defaults.attributes.deposit_amount" str-to-float ng-model="working.deposit_amount" type="number" step="0.01"/>
</div>
</div>
commit e7e3ae65e2f5abd5f4da9378fb1f08ee46747c9c
Author: Jason Boyer <JBoyer at library.in.gov>
Date: Fri Jan 5 16:55:15 2018 -0500
LP1741072: Fix JS test for template conversion
Changing 2 fields from "strings" to numbers does
cause such a test to fail, as one might expect.
Now the test is updated to meet the current
expectations of the template conversion.
Signed-off-by: Jason Boyer <JBoyer at library.in.gov>
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
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 dbafc5a..a7269e03 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
@@ -333,6 +333,11 @@ function(egCore , $q) {
if ( curr_field["type"] === "stat_cat" ) {
stat_cats[field_name] = parseInt(curr_field["value"]);
} else {
+ tmp_val = curr_field['value'];
+ if ( tmp_val.toString().match(/^[-0-9.]+$/)) {
+ tmp_val = parseFloat(tmp_val);
+ }
+
if (field_name.match(/^batch_.*_menulist$/)) {
// special handling for volume fields
if (!("callnumber" in curr_templ)) curr_templ["callnumber"] = {};
diff --git a/Open-ILS/web/js/ui/default/staff/test/unit/egVolCopy.js b/Open-ILS/web/js/ui/default/staff/test/unit/egVolCopy.js
index 2dd877a..b299211 100644
--- a/Open-ILS/web/js/ui/default/staff/test/unit/egVolCopy.js
+++ b/Open-ILS/web/js/ui/default/staff/test/unit/egVolCopy.js
@@ -12,7 +12,7 @@ describe('egVolCopyTest', function(){
it('itemSvc.convert_xul_templates converts copy templates as expected', inject(function(itemSvc) {
var xul = JSON.parse('{"Easy Reader 1":{"Circulation Library":{"field":"circ_lib","type":"attribute","value":"4"},"Status":{"field":"status","type":"attribute","value":"0"},"Location/Collection":{"field":"location","value":"103","type":"attribute"},"Deposit?":{"field":"deposit","value":"f","type":"attribute"},"Copy Number":{"field":"copy_number","value":"1","type":"attribute"},"Price":{"type":"attribute","value":"25.55","field":"price"},"Loan Duration":{"value":"2","type":"attribute","field":"loan_duration"},"Circulate?":{"field":"circulate","type":"attribute","value":"t"},"Holdable?":{"field":"holdable","type":"attribute","value":"t"},"Circulation Modifier":{"field":"circ_modifier","value":"<HACK:KLUDGE:NULL>","type":"attribute"},"Floating?":{"field":"floating","value":"<HACK:KLUDGE:NULL>","type":"attribute"},"Owning Lib : Call Number":{"value":"4","type":"owning_lib","field":null},"Reference?":{"field":"ref","type":"attribute","value":"f"},"Quality":{"type":"attrib
ute","value":"t","field":"mint_condition"},"Acquisition Cost":{"field":"cost","type":"attribute","value":"25.55"},"OPAC Visible?":{"type":"attribute","value":"t","field":"opac_visible"},"Deposit Amount":{"field":"deposit_amount","type":"attribute","value":"1.25"},"Fine Level":{"field":"fine_level","type":"attribute","value":"2"},"Circulate as Type":{"field":"circ_as_type","type":"attribute","value":"a"},"Age-based Hold Protection":{"value":"<HACK:KLUDGE:NULL>","type":"attribute","field":"age_protect"}},"Reference (unified)":{"volume_copy_creator.batch_class_menulist":{"field":"batch_class_menulist","type":"volume_copy_creator","value":"2"},"volume_copy_creator.batch_suffix_menulist":{"value":"1","type":"volume_copy_creator","field":"batch_suffix_menulist"},"volume_copy_creator.batch_prefix_menulist":{"type":"volume_copy_creator","value":"1","field":"batch_prefix_menulist"},"Location/Collection":{"field":"location","value":"102","type":"attribute"}}}');
- var webstaff = JSON.parse('{"Reference (unified)":{"callnumber":{"classification":2,"prefix":1,"suffix":1},"location":102},"Easy Reader 1":{"location":103,"circ_as_type":"a","status":0,"copy_number":1,"circ_lib":4,"ref":"f","circulate":"t","mint_condition":"t","cost":25.55,"deposit_amount":1.25,"deposit":"f","price":25.55,"opac_visible":"t","fine_level":"2","loan_duration":"2","holdable":"t"}}');
+ var webstaff = JSON.parse('{"Reference (unified)":{"callnumber":{"classification":2,"prefix":1,"suffix":1},"location":102},"Easy Reader 1":{"location":103,"circ_as_type":"a","status":0,"copy_number":1,"circ_lib":4,"ref":"f","circulate":"t","mint_condition":"t","cost":25.55,"deposit_amount":1.25,"deposit":"f","price":25.55,"opac_visible":"t","fine_level":2,"loan_duration":2,"holdable":"t"}}');
expect(itemSvc.convert_xul_templates(xul)).toEqual(webstaff);
}));
-----------------------------------------------------------------------
Summary of changes:
.../templates/staff/cat/volcopy/t_attr_edit.tt2 | 2 +-
.../web/js/ui/default/staff/cat/volcopy/app.js | 5 +++++
.../web/js/ui/default/staff/test/unit/egVolCopy.js | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list