From ce01eebaac67cd0cba0b70c33213f000b60a31e6 Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Fri, 5 Jan 2018 16:55:15 -0500 Subject: [PATCH] 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 Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton --- Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js | 5 +++++ Open-ILS/web/js/ui/default/staff/test/unit/egVolCopy.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 2efd97568a..39e4aafc77 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 2dd877ab93..b2992117f4 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":"","type":"attribute"},"Floating?":{"field":"floating","value":"","type":"attribute"},"Owning Lib : Call Number":{"value":"4","type":"owning_lib","field":null},"Reference?":{"field":"ref","type":"attribute","value":"f"},"Quality":{"type":"attribute","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":"","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); })); -- 2.43.2