From: Anjo K. <an...@us...> - 2006-06-26 12:38:10
|
Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXJSPopUpRelationPicker.wo In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12358/Components/Nonlocalized.lproj/ERXJSPopUpRelationPicker.wo Modified Files: ERXJSPopUpRelationPicker.html Log Message: Now each child appears only once. Index: ERXJSPopUpRelationPicker.html =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXJSPopUpRelationPicker.wo/ERXJSPopUpRelationPicker.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ERXJSPopUpRelationPicker.html 26 Jun 2006 12:01:51 -0000 1.12 --- ERXJSPopUpRelationPicker.html 26 Jun 2006 12:38:06 -0000 1.13 *************** *** 1,7 **** <!--webobject name=Custom1></webobject--><script> <webobject name="Array"></webobject> ! function Entity(n,id,ch,sel,def) { this.name = n; this.id = id; this.children = ch; this.isSelected = sel; --- 1,8 ---- <!--webobject name=Custom1></webobject--><script> <webobject name="Array"></webobject> ! function Entity(n,id,uid,ch,sel,def) { this.name = n; this.id = id; + this.uid = uid; this.children = ch; this.isSelected = sel; *************** *** 16,19 **** --- 17,21 ---- var hasSelection = false; var offset = 0; + var matches = new Object(); if(selectControl.options != null) { for (var i=0; i < selectControl.options.length; i++) { *************** *** 26,35 **** offset = 1; } for (var i=0; i < objects.length; i++) { var entity = objects[i]; ! selectControl.options[i+offset] = new Option(entity.name, entity.id, false, false); ! if (entity.isSelected) { ! selectControl.options[i+offset].selected = true; ! hasSelection = true; } } --- 28,42 ---- offset = 1; } + var j = 0; for (var i=0; i < objects.length; i++) { var entity = objects[i]; ! if(matches[entity.uid] == undefined) { ! selectControl.options[j+offset] = new Option(entity.name, entity.id, false, false); ! if (entity.isSelected) { ! selectControl.options[j+offset].selected = true; ! hasSelection = true; ! } ! matches[entity.uid] = entity.uid; ! j++; } } |