[Fmsystem-commits] [17398] controller: procedure, last edit, when and who

[sigurdne]

Revision: 17398
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17398
Author:   sigurdne
Date:     2017-12-05 10:13:40 -0500 (Tue, 05 Dec 2017)
Log Message:
-----------
controller: procedure, last edit, when and who

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

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2017-12-05 15:12:25 UTC 
(rev 17397)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2017-12-05 15:13:40 UTC 
(rev 17398)
@@ -475,6 +475,10 @@
                                $end_date = 
$GLOBALS['phpgw']->common->show_date($procedure->get_end_date(), 
$this->dateformat);
                                $revision_date = 
$GLOBALS['phpgw']->common->show_date($procedure->get_revision_date(), 
$this->dateformat);
 
+                               if(!empty($procedure_array['modified_by']))
+                               {
+                                       $procedure_array['modified_by_name'] = 
$GLOBALS['phpgw']->accounts->id2name($procedure_array['modified_by']);
+                               }
 
                                $data = array
                                        (
@@ -645,6 +649,10 @@
                                        )
                                );
 
+                               if(!empty($procedure_array['modified_by']))
+                               {
+                                       $procedure_array['modified_by_name'] = 
$GLOBALS['phpgw']->accounts->id2name($procedure_array['modified_by']);
+                               }
                                $data = array
                                        (
                                        'tabs' => 
phpgwapi_jquery::tabview_generate($tabs, 'procedure', 'procedure_tabview'),

Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl        
2017-12-05 15:12:25 UTC (rev 17397)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl        
2017-12-05 15:13:40 UTC (rev 17398)
@@ -108,6 +108,23 @@
                                                </xsl:choose>
                                        </dd>
                                        <dt>
+                                               <label for="modified_by">
+                                                       <xsl:value-of 
select="php:function('lang','modified by')" />
+                                               </label>
+                                       </dt>
+                                       <dd>
+                                                       <xsl:value-of 
select="procedure/modified_by_name" />
+                                       </dd>
+                                       <dt>
+                                               <label for="modified_date">
+                                                       <xsl:value-of 
select="php:function('lang','Modified date')" />
+                                               </label>
+                                       </dt>
+                                       <dd>
+                                               <xsl:value-of 
select="php:function('date', $date_format, number(procedure/modified_date))"/>
+                                       </dd>
+
+                                       <dt>
                                                <label for="purpose">
                                                        <xsl:value-of 
select="php:function('lang','Procedure purpose')" />
                                                </label>