Changeset 2270 in products

Timestamp:

May 7, 2010 1:04:58 PM (14 years ago)

Author:

mylan

Message:

Fix clashing ReferenceDataGridField? with ATReferenceBrowserWidget ones.

Location:

quintagroup.referencedatagridfield/trunk/quintagroup/referencedatagridfield/skins/referencedatagridfield

Files:

• referencebrowser.js (modified) (3 diffs)
• referencebrowser_popup.pt (modified) (1 diff)

quintagroup.referencedatagridfield/trunk/quintagroup/referencedatagridfield/skins/referencedatagridfield/referencebrowser.js

@@ -1 +1 @@
 // function to open the popup window
 function getOrderIndex(currnode) {
-    if (dataGridFieldFunctions){
+    if (typeof(dataGridFieldFunctions) == "object") {
         var rows = dataGridFieldFunctions.getWidgetRows(currnode);
         var row = dataGridFieldFunctions.getParentElementById(currnode, "datagridwidget-row");      
@@ -33 +33 @@
 
     // If it is about DataGridField use it to chose correct element
-    if (dataGridFieldFunctions){
+    if (typeof(dataGridFieldFunctions) == "object" && order_idx >= 0) {
         var rows = dataGridFieldFunctions.getWidgetRows(element);
         if (rows.length >= order_idx) {
@@ -44 +44 @@
                 }
             }
-            // for (var i=0;i<=row.childNodes.length;i++) {
-            //     var node = row.childNodes[i]
-            //  if (node.nodeName.toLowerCase() == 'td') {
-            //      for (var j=0;j<=node.childNodes.length;j++) {
-            //          var tr_node = node.childNodes[i]
-            //          if (tr_node.id == widget_id) {
-            //              return tr_node;
-            //          }
-            //      }
-            //     }
-            // }
         }
     }

quintagroup.referencedatagridfield/trunk/quintagroup/referencedatagridfield/skins/referencedatagridfield/referencebrowser_popup.pt

@@ -32 +32 @@
                       at_url python:here.REQUEST.get('at_url');
                       fieldName python:here.REQUEST.get('fieldName');
-                      order_idx python:here.REQUEST.get('order_idx');
+                      order_idx python:here.REQUEST.get('order_idx', -1);
                       fieldRealName python:here.REQUEST.get('fieldRealName');
                       at_obj python:here.restrictedTraverse(at_url);