From 207dd51b5dae6f5c4f88f576f79d6736b16ef559 Mon Sep 17 00:00:00 2001 From: berick Date: Thu, 5 May 2011 10:28:15 -0400 Subject: [PATCH] added edit support for lwm_ratio on merge_profile; default ratio to that of the merge profile if selected and if a ratio is set on the profile --- .../web/js/ui/default/vandelay/vandelay.js | 19 ++++++++++++++++--- .../default/vandelay/inc/profiles.tt2 | 4 ++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js index 4aeef8f9cb..b72438caec 100644 --- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js +++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js @@ -87,6 +87,7 @@ var vlQueueGridColumePicker = {}; var vlBibSources = []; var importItemDefs = []; var matchSets = {}; +var mergeProfiles = []; /** * Grab initial data @@ -106,13 +107,13 @@ function vlInit() { runStartupCommands(); } - var profiles = new openils.PermaCrud().retrieveAll('vmp'); - vlUploadMergeProfile.store = new dojo.data.ItemFileReadStore({data:fieldmapper.vmp.toStoreData(profiles)}); + mergeProfiles = new openils.PermaCrud().retrieveAll('vmp'); + vlUploadMergeProfile.store = new dojo.data.ItemFileReadStore({data:fieldmapper.vmp.toStoreData(mergeProfiles)}); vlUploadMergeProfile.labelAttr = 'name'; vlUploadMergeProfile.searchAttr = 'name'; vlUploadMergeProfile.startup(); - vlUploadMergeProfile2.store = new dojo.data.ItemFileReadStore({data:fieldmapper.vmp.toStoreData(profiles)}); + vlUploadMergeProfile2.store = new dojo.data.ItemFileReadStore({data:fieldmapper.vmp.toStoreData(mergeProfiles)}); vlUploadMergeProfile2.labelAttr = 'name'; vlUploadMergeProfile2.searchAttr = 'name'; vlUploadMergeProfile2.startup(); @@ -1226,6 +1227,18 @@ function vlShowUploadForm() { vlUploadQueueHoldingsImportProfile.store = new dojo.data.ItemFileReadStore({data:viiad.toStoreData(importItemDefs)}); vlUpdateMatchSetSelector(vlUploadRecordType.getValue()); + + // use ratio from the merge profile if it's set + dojo.connect( + vlUploadMergeProfile, + 'onChange', + function(val) { + if(!val) return; + var profile = mergeProfiles.filter(function(p) { return (p.id() == val); })[0]; + if(profile.lwm_ratio() != null) + vlUploadQueueAutoOverlayBestMatchRatio.attr('value', profile.lwm_ratio()+''); + } + ); } function vlShowQueueSelect() { diff --git a/Open-ILS/web/templates/default/vandelay/inc/profiles.tt2 b/Open-ILS/web/templates/default/vandelay/inc/profiles.tt2 index 5bd4d4daab..ca67f3a84e 100644 --- a/Open-ILS/web/templates/default/vandelay/inc/profiles.tt2 +++ b/Open-ILS/web/templates/default/vandelay/inc/profiles.tt2 @@ -13,9 +13,9 @@ -- 2.43.2