[Fmsystem-commits] [17628] property: keep linebreaks for view-mode

[sigurdne]

Revision: 17628
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17628
Author:   sigurdne
Date:     2018-01-18 05:02:49 -0500 (Thu, 18 Jan 2018)
Log Message:
-----------
property: keep linebreaks for view-mode

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

Modified: trunk/property/inc/class.custom_fields.inc.php
===================================================================
--- trunk/property/inc/class.custom_fields.inc.php      2018-01-18 10:01:29 UTC 
(rev 17627)
+++ trunk/property/inc/class.custom_fields.inc.php      2018-01-18 10:02:49 UTC 
(rev 17628)
@@ -156,6 +156,10 @@
                                                }
                                        }
                                }
+                               else if ($attributes['datatype'] == 'T' && 
$view_only)
+                               {
+                                       $attributes['value'] = 
nl2br($attributes['value']);
+                               }
                                else if ($attributes['datatype'] == 'AB')
                                {
                                        if ($attributes['value'])

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2018-01-18 10:01:29 UTC (rev 
17627)
+++ trunk/property/inc/class.uientity.inc.php   2018-01-18 10:02:49 UTC (rev 
17628)
@@ -1728,7 +1728,7 @@
                        if ($id)
                        {
                                $values = 
$this->bo->read_single(array('entity_id' => $this->entity_id, 'cat_id' => 
$this->cat_id,
-                                       'id' => $id));
+                                       'id' => $id, 'view' => $mode=='view'));
                        }
                        else
                        {

Modified: trunk/property/templates/base/attributes_view.xsl
===================================================================
--- trunk/property/templates/base/attributes_view.xsl   2018-01-18 10:01:29 UTC 
(rev 17627)
+++ trunk/property/templates/base/attributes_view.xsl   2018-01-18 10:02:49 UTC 
(rev 17628)
@@ -358,7 +358,7 @@
                                                </table>
                                        </xsl:when>
                                        <xsl:when test="datatype='T'">
-                                               <xsl:value-of select="value"/>
+                                               <xsl:value-of 
disable-output-escaping="yes" select="value"/>
                                        </xsl:when>
                                        <xsl:when test="datatype='pwd'">
                                                <input type="password" 
name="values_attribute[{id}][value]" size="30">