[Fmsystem-commits] [10523] property: hide empty values

[Sigurd Nes]

Revision: 10523
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10523
Author:   sigurdne
Date:     2012-11-20 11:39:27 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
property: hide empty values

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

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2012-11-20 10:24:32 UTC (rev 
10522)
+++ trunk/property/inc/class.uientity.inc.php   2012-11-20 11:39:27 UTC (rev 
10523)
@@ -642,7 +642,7 @@
                                        $i = 4;
                                        foreach ( $attrib_data as $attrib )
                                        {
-                                               if($attrib['datatype'] == 'LB' 
|| $attrib['datatype'] == 'CH' || $attrib['datatype'] == 'R')
+                                               if(($attrib['datatype'] == 'LB' 
|| $attrib['datatype'] == 'CH' || $attrib['datatype'] == 'R') && 
$attrib['choice'])
                                                {
                                                        
$datatable['actions']['form'][0]['fields']['field'][] = array
                                                        (

Modified: trunk/property/templates/base/entity.xsl
===================================================================
--- trunk/property/templates/base/entity.xsl    2012-11-20 10:24:32 UTC (rev 
10522)
+++ trunk/property/templates/base/entity.xsl    2012-11-20 11:39:27 UTC (rev 
10523)
@@ -285,27 +285,32 @@
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
-                                       <div id="related">
-                                               <table cellpadding="2" 
cellspacing="2" width="80%" align="center">
-                                                       <tr>
-                                                               <td 
valign='top'>
-                                                                       
<xsl:value-of select="php:function('lang', 'started from')"/>
-                                                               </td>
-                                                               <td>
-                                                                       <div 
id="datatable-container_1"/>
-                                                               </td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td 
valign='top'>
-                                                                       
<xsl:value-of select="php:function('lang', 'used in')"/>
-                                                               </td>
-                                                               <td>
-                                                                       <div 
id="datatable-container_2"/>
-                                                               </td>
-                                                       </tr>
-                                               </table>
-                                       </div>
 
+                                       <xsl:choose>
+                                               <xsl:when test="value_id !=''">
+                                                       <div id="related">
+                                                               <table 
cellpadding="2" cellspacing="2" width="80%" align="center">
+                                                                       <tr>
+                                                                               
<td valign='top'>
+                                                                               
        <xsl:value-of select="php:function('lang', 'started from')"/>
+                                                                               
</td>
+                                                                               
<td>
+                                                                               
        <div id="datatable-container_1"/>
+                                                                               
</td>
+                                                                       </tr>
+                                                                       <tr>
+                                                                               
<td valign='top'>
+                                                                               
        <xsl:value-of select="php:function('lang', 'used in')"/>
+                                                                               
</td>
+                                                                               
<td>
+                                                                               
        <div id="datatable-container_2"/>
+                                                                               
</td>
+                                                                       </tr>
+                                                               </table>
+                                                       </div>
+                                               </xsl:when>
+                                       </xsl:choose>
+
                                        <!--
                                        <xsl:choose>
                                                <xsl:when test="related_link != 
''">