[Fmsystem-commits] [8037]

[Erik Holm-Larsen]

Revision: 8037
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8037
Author:   erikhl
Date:     2011-11-07 08:46:51 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------


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

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2011-11-07 08:39:11 UTC 
(rev 8036)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2011-11-07 08:46:51 UTC 
(rev 8037)
@@ -134,6 +134,16 @@
                                        
$procedure->set_revision_date(strtotime(phpgw::get_var('revision_date_hidden')));
                                        
$procedure->set_control_area_id(phpgw::get_var('control_area'));
                                        
+                                       $revision = 
(int)$procedure->get_revision_no();
+                                       if($revision && is_numeric($revision) 
&& $revision > 0)
+                                       {
+                                               
$procedure->set_revision_no($revision);
+                                       }
+                                       else
+                                       {
+                                               $procedure->set_revision_no(1);
+                                       }
+                                       
                                        if(isset($procedure_id) && 
$procedure_id > 0)
                                        {
                                                $proc_id = $procedure_id;
@@ -174,7 +184,7 @@
                                        }
                                        else
                                        {
-                                               $procedure->set_revision_no(1);
+                                               $procedure->set_revision_no(2);
                                        }
                                        
$procedure->set_title(phpgw::get_var('title'));
                                        
$procedure->set_purpose(phpgw::get_var('purpose','html'));

Modified: trunk/controller/templates/base/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure_item.xsl  2011-11-07 08:39:11 UTC 
(rev 8036)
+++ trunk/controller/templates/base/procedure_item.xsl  2011-11-07 08:46:51 UTC 
(rev 8037)
@@ -31,6 +31,9 @@
                                        <dt>
                                                <label 
for="revision_no"><xsl:value-of select="php:function('lang','Procedure 
revision')" /></label>
                                        </dt>
+                                       <dd>
+                                               <xsl:value-of 
select="procedure/revision_no" />
+                                       </dd>
                                        <dt>
                                                <label 
for="control_area"><xsl:value-of select="php:function('lang','Control area')" 
/></label>
                                        </dt>
@@ -67,9 +70,6 @@
                                                <xsl:value-of 
disable-output-escaping="yes" select="end_date"/>
                                        </dd>
                                        </xsl:if>
-                                       <dd>
-                                               <xsl:value-of 
select="procedure/revision_no" />
-                                       </dd>
                                        <dt>
                                                <label 
for="purpose"><xsl:value-of select="php:function('lang','Procedure purpose')" 
/></label>
                                        </dt>