From 76699369880f251fa0aae5f936642e53cb658a92 Mon Sep 17 00:00:00 2001 From: berick Date: Wed, 4 May 2011 12:03:22 -0400 Subject: [PATCH] slight mods to vandelay match set page to sync w/ updated bib/auth match table layout --- Open-ILS/web/js/ui/default/vandelay/vandelay.js | 10 +++++++--- Open-ILS/web/templates/default/vandelay/inc/matches.tt2 | 6 ------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js index ad93a3cc3a..bb6ce0c0db 100644 --- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js +++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js @@ -444,7 +444,7 @@ function vlLoadMatchUI(recId) { var params = [records]; if(currentType == 'auth') { retrieve = ['open-ils.cat', 'open-ils.cat.authority.record.retrieve']; - parmas = [authtoken, records, {clear_marc:1}]; + params = [authtoken, records, {clear_marc:1}]; } fieldmapper.standardRequest( @@ -464,24 +464,26 @@ function vlLoadMatchUI(recId) { // build the data store of records with match information var dataStore = bre.toStoreData(recs, null, - {virtualFields:['dest_matchpoint', 'src_matchpoint', '_id']}); + {virtualFields:['_id']}); dataStore.identifier = '_id'; var matchSeenMap = {}; + // XXX much of this is no longer needed with changes to match_set for(var i = 0; i < dataStore.items.length; i++) { var item = dataStore.items[i]; item._id = i; // just need something unique + /* for(var j = 0; j < matches.length; j++) { var match = matches[j]; if(match.eg_record() == item.id && !matchSeenMap[match.id()]) { - item.dest_matchpoint = match.field_type(); var attr = getRecAttrFromMatch(queuedRecordsMap[recId], match); item.src_matchpoint = getRecAttrDefFromAttr(attr, currentType).code(); matchSeenMap[match.id()] = 1; break; } } + */ } // now populate the grid @@ -554,6 +556,7 @@ function getRecMatchesFromAttrCode(rec, attrCode) { } */ +/* function getRecAttrFromMatch(rec, match) { for(var i = 0; i < rec.attributes().length; i++) { var attr = rec.attributes()[i]; @@ -561,6 +564,7 @@ function getRecAttrFromMatch(rec, match) { return attr; } } +*/ function getRecAttrDefFromAttr(attr, type) { var defs = (type == 'bib') ? bibAttrDefs : authAttrDefs; diff --git a/Open-ILS/web/templates/default/vandelay/inc/matches.tt2 b/Open-ILS/web/templates/default/vandelay/inc/matches.tt2 index 90f3546a96..39f826107d 100644 --- a/Open-ILS/web/templates/default/vandelay/inc/matches.tt2 +++ b/Open-ILS/web/templates/default/vandelay/inc/matches.tt2 @@ -8,13 +8,7 @@ name: '&vandelay.overlay.target;', get: vlGetOverlayTargetSelector, formatter : vlFormatOverlayTargetSelector, - /* - value: '<input type="checkbox" name="vl-overlay-target-RECID" '+ - 'onclick="vlHandleOverlayTargetSelected(ID, GRIDID);" gridid="GRIDID" match="ID"/>' - */ }, - {name:'&vandelay.source.match.point;', field:'src_matchpoint'}, - {name:'&vandelay.dest.match.point;', field:'dest_matchpoint'}, {name: '&vandelay.id;', field:'id'}, { name: '&vandelay.view.marc;', get: vlGetViewMARC, -- 2.11.0