[Fmsystem-commits] [11836] Fixed display of ducuments-view on procedure

[Erik Holm-Larsen]

Revision: 11836
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11836
Author:   erikhl
Date:     2014-03-17 08:37:10 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Fixed display of ducuments-view on procedure

Modified Paths:
--------------
    trunk/controller/inc/class.uidocument.inc.php
    trunk/controller/inc/class.uiprocedure.inc.php
    trunk/controller/templates/base/procedure/procedure_item.xsl

Modified: trunk/controller/inc/class.uidocument.inc.php
===================================================================
--- trunk/controller/inc/class.uidocument.inc.php       2014-03-17 07:38:04 UTC 
(rev 11835)
+++ trunk/controller/inc/class.uidocument.inc.php       2014-03-17 08:37:10 UTC 
(rev 11836)
@@ -495,8 +495,7 @@
                 
                 $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('controller') . '::' . lang('Procedure');
                 
-                self::render_template_xsl(array('procedure/procedure_tabs', 
-                                                                               
'common', 
+                self::render_template_xsl(array('procedure/procedure_tabs',
                                                                                
'procedure/procedure_documents'), $data);
             }
         }

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2014-03-17 07:38:04 UTC 
(rev 11835)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2014-03-17 08:37:10 UTC 
(rev 11836)
@@ -204,9 +204,11 @@
                                        $purpose_txt = str_replace(" ", " 
", $purpose_txt);
                                        $reference_txt = 
phpgw::get_var('reference','html');
                                        $reference_txt = str_replace(" ", 
" ", $reference_txt);
+                    $responsibility_txt = 
phpgw::get_var('responsibility','html');
+                                       $responsibility_txt = 
str_replace(" ", " ", $responsibility_txt);
                                        
$procedure->set_title(phpgw::get_var('title'));
                                        $procedure->set_purpose($purpose_txt);
-                                       
$procedure->set_responsibility(phpgw::get_var('responsibility'));
+                                       
$procedure->set_responsibility($responsibility_txt);
                                        
$procedure->set_description($description_txt);
                                        
$procedure->set_reference($reference_txt);
                                        
$procedure->set_attachment(phpgw::get_var('attachment'));

Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl        
2014-03-17 07:38:04 UTC (rev 11835)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl        
2014-03-17 08:37:10 UTC (rev 11836)
@@ -94,7 +94,7 @@
                                        <dd>
                                        <xsl:choose>
                                                <xsl:when test="editable">
-                                                       <textarea id="purpose" 
name="purpose" rows="5" cols="60"><xsl:value-of select="procedure/purpose" 
disable-output-escaping="yes"/></textarea>
+                                                       <textarea id="purpose" 
name="purpose" rows="5" cols="60" style="width: 690px;"><xsl:value-of 
select="procedure/purpose" disable-output-escaping="yes"/></textarea>
                                                </xsl:when>
                                                <xsl:otherwise>
                                                        <xsl:value-of 
select="procedure/purpose" disable-output-escaping="yes"/>
@@ -110,7 +110,7 @@
                                                        <textarea 
id="responsibility" name="responsibility" rows="5" cols="60"><xsl:value-of 
select="procedure/responsibility" /></textarea>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <xsl:value-of 
select="procedure/responsibility" />
+                                                       <xsl:value-of 
select="procedure/responsibility" disable-output-escaping="yes"/>
                                                </xsl:otherwise>
                                        </xsl:choose>
                                        </dd>