[Fmsystem-commits] [7402] property: fix custom attribs

[Sigurd Nes]

Revision: 7402
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7402
Author:   sigurdne
Date:     2011-06-20 09:06:31 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
property: fix custom attribs

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uirequest.inc.php
    trunk/property/templates/base/project.xsl
    trunk/property/templates/base/request.xsl

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2011-06-20 06:30:25 UTC (rev 
7401)
+++ trunk/property/inc/class.uiproject.inc.php  2011-06-20 09:06:31 UTC (rev 
7402)
@@ -1658,7 +1658,7 @@
                                (
                                        'suppressmeter'                         
                => isset($config->config_data['project_suppressmeter']) && 
$config->config_data['project_suppressmeter'] ? 1 : '',
                                        'suppresscoordination'                  
        => $suppresscoordination,
-                                       'attributes'                            
                => $values['attributes'],
+                                       'custom_attributes'                     
                => array('attributes' => $values['attributes']),
                                        'lookup_functions'                      
                => 
isset($values['lookup_functions'])?$values['lookup_functions']:'',
                                        'b_account_data'                        
                => $b_account_data,
                                        'ecodimb_data'                          
                => $ecodimb_data,
@@ -1830,7 +1830,7 @@
 
                        $template_vars = array();
                        $template_vars['datatable'] = $datatable;
-                       $GLOBALS['phpgw']->xslttpl->add_file(array('project'));
+
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
 
                        $GLOBALS['phpgw']->css->validate_file('datatable');
@@ -1902,7 +1902,7 @@
 
                        $id     = phpgw::get_var('id', 'int');
 
-                       $GLOBALS['phpgw']->xslttpl->add_file(array('project'));
+                       
$GLOBALS['phpgw']->xslttpl->add_file(array('project','attributes_form'));
 
                        $values = $this->bo->read_single($id);
 
@@ -1985,8 +1985,7 @@
 
                                        'project_group_data'                    
        => $project_group_data,
                                        'value_origin'                          
                => $values['origin'],
-                                       //      'value_origin_type'             
                        => $origin,
-                                       //      'value_origin_id'               
                        => $origin_id,
+                                       'custom_attributes'                     
                => array('attributes' => $values['attributes']),
 
                                        'table_header_workorder_budget'         
=> $table_header_workorder_budget,
                                        'lang_no_workorders'                    
        => lang('No workorder budget'),

Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php  2011-06-20 06:30:25 UTC (rev 
7401)
+++ trunk/property/inc/class.uirequest.inc.php  2011-06-20 09:06:31 UTC (rev 
7402)
@@ -1328,7 +1328,7 @@
                                        'value_authorities_demands'             
=> isset($this->config->config_data['authorities_demands']) &&  
$this->config->config_data['authorities_demands'] ? 
$this->config->config_data['authorities_demands'] : 0,
                                        'suppressmeter'                         
                => isset($this->config->config_data['project_suppressmeter']) 
&& $this->config->config_data['project_suppressmeter'] ? 1 : '',
                                        'show_dates'                            
                => $show_dates,
-                                       'attributes'                            
                => $values['attributes'],
+                                       'custom_attributes'                     
                => array('attributes' => $values['attributes']),
                                        'property_js'                           
                => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
                                        'datatable'                             
                        => $datavalues,
                                        'myColumnDefs'                          
                => $myColumnDefs,

Modified: trunk/property/templates/base/project.xsl
===================================================================
--- trunk/property/templates/base/project.xsl   2011-06-20 06:30:25 UTC (rev 
7401)
+++ trunk/property/templates/base/project.xsl   2011-06-20 09:06:31 UTC (rev 
7402)
@@ -372,7 +372,7 @@
                                </textarea>
                        </td>
                </tr>
-               <xsl:call-template name="attributes"/>
+               <xsl:apply-templates select="custom_attributes/attributes"/>
        </table>
 </div>
 
@@ -969,6 +969,7 @@
                                                                </xsl:choose>
                                                        </xsl:for-each>
                                                </tr>
+                                               <xsl:apply-templates 
select="custom_attributes/attributes"/>
                                        </table>
                                </div>
 

Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl   2011-06-20 06:30:25 UTC (rev 
7401)
+++ trunk/property/templates/base/request.xsl   2011-06-20 09:06:31 UTC (rev 
7402)
@@ -576,7 +576,7 @@
                                                                                
                </table>
                                                                                
        </td>
                                                                                
</tr>
-                                                                               
<xsl:call-template name="attributes"/>
+                                                                               
<xsl:apply-templates select="custom_attributes/attributes"/>
                                                                                
<tr>
                                                                                
        <td>
                                                                                
                <br/>