[Fmsystem-commits] [12540] fix vendor lookup

[Sigurd Nes]

Revision: 12540
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12540
Author:   sigurdne
Date:     2015-01-06 15:22:27 +0000 (Tue, 06 Jan 2015)
Log Message:
-----------
fix vendor lookup

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.uilookup.inc.php
    branches/dev-syncromind/property/templates/base/vendor_form.xsl
    branches/dev-syncromind/property/templates/pure/vendor_form.xsl

Modified: branches/dev-syncromind/property/inc/class.uilookup.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilookup.inc.php 2015-01-06 
13:38:11 UTC (rev 12539)
+++ branches/dev-syncromind/property/inc/class.uilookup.inc.php 2015-01-06 
15:22:27 UTC (rev 12540)
@@ -756,16 +756,16 @@
                        }
 
                        $action = '';
-                       $action .= 
'window.parent.document.getElementById("'.$contact_id.'").value = "";'."\r";
-                       $action .= 
'window.parent.document.getElementById("'.$org_name.'").value = "";'."\r";
-                       $action .= 
'window.parent.document.getElementById("'.$contact_id.'").value = 
aData["id"];'."\r";
-                       $action .= 
'window.parent.document.getElementById("'.$org_name.'").value = 
aData["org_name"];'."\r";
+                       $action .= 
'parent.document.getElementsByName("'.$contact_id.'")[0].value = "";'."\r";
+                       $action .= 
'parent.document.getElementsByName("'.$org_name.'")[0].value = "";'."\r";
+                       $action .= 
'parent.document.getElementsByName("'.$contact_id.'")[0].value = 
aData["id"];'."\r";
+                       $action .= 
'parent.document.getElementsByName("'.$org_name.'")[0].value = 
aData["org_name"];'."\r";
                        if($contact_id  == 'vendor_id')
                        {
-                               $action .= 
'window.parent.document.getElementById("'.$contact_id.'").setAttribute("vendor_id","'.$contact_id.'",0);'."\r";
-                               $action .= 
'window.parent.document.getElementById("'.$contact_id.'").removeAttribute("vendor_id");'."\r";
+                               $action .= 
'parent.document.getElementsByName("'.$contact_id.'")[0].setAttribute("vendor_id","'.$contact_id.'",0);'."\r";
+                               $action .= 
'parent.document.getElementsByName("'.$contact_id.'")[0].removeAttribute("vendor_id");'."\r";
                        }
-                       $action .= 
'window.parent.JqueryPortico.onPopupClose("close");'."\r";
+                       $action .= 
'parent.JqueryPortico.onPopupClose("close");'."\r";
                        
                        $data = array(
                                'left_click_action'     => $action,

Modified: branches/dev-syncromind/property/templates/base/vendor_form.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/vendor_form.xsl     
2015-01-06 13:38:11 UTC (rev 12539)
+++ branches/dev-syncromind/property/templates/base/vendor_form.xsl     
2015-01-06 15:22:27 UTC (rev 12540)
@@ -6,10 +6,9 @@
        <!-- New template-->
        <xsl:template match="vendor_data">
                <script type="text/javascript">
-                       self.name="first_Window";
                        function vendor_lookup()
                        {
-                               Window1=window.open('<xsl:value-of 
select="vendor_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+                               TINY.box.show({iframe:'<xsl:value-of 
select="vendor_link"/>', 
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
 mask:true, animate:true, close: true});
                        }
 
                </script>

Modified: branches/dev-syncromind/property/templates/pure/vendor_form.xsl
===================================================================
--- branches/dev-syncromind/property/templates/pure/vendor_form.xsl     
2015-01-06 13:38:11 UTC (rev 12539)
+++ branches/dev-syncromind/property/templates/pure/vendor_form.xsl     
2015-01-06 15:22:27 UTC (rev 12540)
@@ -6,10 +6,9 @@
        <!-- New template-->
        <xsl:template match="vendor_data">
                <script type="text/javascript">
-                       self.name="first_Window";
                        function vendor_lookup()
                        {
-                               Window1=window.open('<xsl:value-of 
select="vendor_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+                               TINY.box.show({iframe:'<xsl:value-of 
select="vendor_link"/>', 
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
 mask:true, animate:true, close: true});
                        }
 
                </script>