[Fmsystem-commits] [11233] move blank_function

[Sigurd Nes]

Revision: 11233
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11233
Author:   sigurdne
Date:     2013-07-03 09:37:38 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
move blank_function

Modified Paths:
--------------
    trunk/property/inc/class.bolocation.inc.php
    trunk/property/inc/class.uientity.inc.php
    trunk/property/inc/class.uitts.inc.php
    trunk/property/templates/base/entity.xsl
    trunk/property/templates/base/tts.xsl

Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2013-07-03 08:25:23 UTC (rev 
11232)
+++ trunk/property/inc/class.bolocation.inc.php 2013-07-03 09:37:38 UTC (rev 
11233)
@@ -608,6 +608,20 @@
                                phpgwapi_cache::session_set('property', 
'lookup_fields_entity',$input_name_entity);
                        }
 
+                       if($input_name_entity && is_array($input_name_entity))
+                       {
+                               $function_blank_entity_values = "function 
blank_entity_values()\n{\n";
+
+                               for ($k=0;$k<count($input_name_entity);$k++)
+                               {
+                                       $function_blank_entity_values .= 
"\tdocument.getElementsByName('{$input_name_entity[$k]}')[0].value = '';\n";
+                               }
+                               $function_blank_entity_values .= "}\n";
+
+                               $GLOBALS['phpgw']->js->add_code('', 
$function_blank_entity_values);
+                       }
+
+
                        if(isset($insert_record))
                        {
                                phpgwapi_cache::session_set('property', 
'insert_record',$insert_record);

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2013-07-03 08:25:23 UTC (rev 
11232)
+++ trunk/property/inc/class.uientity.inc.php   2013-07-03 09:37:38 UTC (rev 
11233)
@@ -2316,19 +2316,9 @@
                                $property_js = 
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" . 
str_replace('/', '--', ltrim($property_js,'/'));
                        }
 
-                       $function_blank_entity_values = '';
-                       $input_name_entity      = 
phpgwapi_cache::session_get('property', 'lookup_fields_entity');
-                       if($input_name_entity && is_array($input_name_entity))
-                       {
-                               for ($k=0;$k<count($input_name_entity);$k++)
-                               {
-                                       $function_blank_entity_values .= 
'document.getElementsByName("'.$input_name_entity[$k].'")[0].value = "";' 
."\r\n";
-                               }
-                       }
 
                        $data = array
                        (
-                                       'function_blank_entity_values'  => 
$function_blank_entity_values,
                                        'property_js'                           
        => json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
$property_js),
                                        'datatable'                             
                => $datavalues,
                                        'myColumnDefs'                          
        => $myColumnDefs,       

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2013-07-03 08:25:23 UTC (rev 
11232)
+++ trunk/property/inc/class.uitts.inc.php      2013-07-03 09:37:38 UTC (rev 
11233)
@@ -1991,19 +1991,8 @@
                                
$GLOBALS['phpgw']->jqcal->add_listener('values_finnish_date');
                        }
 
-                       $function_blank_entity_values = '';
-                       $input_name_entity      = 
phpgwapi_cache::session_get('property', 'lookup_fields_entity');
-                       if($input_name_entity && is_array($input_name_entity))
-                       {
-                               for ($k=0;$k<count($input_name_entity);$k++)
-                               {
-                                       $function_blank_entity_values .= 
'document.getElementsByName("'.$input_name_entity[$k].'")[0].value = "";' 
."\r\n";
-                               }
-                       }
-
                        $data = array
                        (
-                                       'function_blank_entity_values'  => 
$function_blank_entity_values,
                                        'custom_attributes'                     
        => array('attributes' => $values['attributes']),
                                        'lookup_functions'                      
        => isset($values['lookup_functions'])?$values['lookup_functions']:'',
                                        'contact_data'                          
        => $contact_data,

Modified: trunk/property/templates/base/entity.xsl
===================================================================
--- trunk/property/templates/base/entity.xsl    2013-07-03 08:25:23 UTC (rev 
11232)
+++ trunk/property/templates/base/entity.xsl    2013-07-03 09:37:38 UTC (rev 
11233)
@@ -405,11 +405,6 @@
                                document.form.active_tab.value = active_tab;    
                
                        }
 
-                       function blank_entity_values()
-                       {
-                               <xsl:value-of 
select="function_blank_entity_values"/>
-                       }
-
                        var property_js = <xsl:value-of select="property_js"/>;
                        var base_java_url = <xsl:value-of 
select="base_java_url"/>;
                        var datatable = new Array();

Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl       2013-07-03 08:25:23 UTC (rev 
11232)
+++ trunk/property/templates/base/tts.xsl       2013-07-03 09:37:38 UTC (rev 
11233)
@@ -22,12 +22,6 @@
                <script type="text/javascript">
                        self.name="first_Window";
                        <xsl:value-of select="lookup_functions"/>
-
-                       function blank_entity_values()
-                       {
-                               <xsl:value-of 
select="function_blank_entity_values"/>
-                       }
-
                </script>
 
                <xsl:choose>