fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [10065] logistic: fix registration/editing activity


From: Torstein
Subject: [Fmsystem-commits] [10065] logistic: fix registration/editing activity
Date: Mon, 01 Oct 2012 07:28:52 +0000

Revision: 10065
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10065
Author:   vator
Date:     2012-10-01 07:28:49 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
logistic: fix registration/editing activity

Modified Paths:
--------------
    trunk/logistic/inc/class.soactivity.inc.php
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/templates/base/activity_item.xsl

Modified: trunk/logistic/inc/class.soactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.soactivity.inc.php 2012-10-01 06:59:05 UTC (rev 
10064)
+++ trunk/logistic/inc/class.soactivity.inc.php 2012-10-01 07:28:49 UTC (rev 
10065)
@@ -116,7 +116,7 @@
                        if($result)
                        {
                                // Return the new activity ID
-                               return 
$this->db->get_last_insert_id('lg_activity', 'id');
+                               return $id;
                        }
                        else
                        {

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-10-01 06:59:05 UTC (rev 
10064)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-10-01 07:28:49 UTC (rev 
10065)
@@ -294,7 +294,6 @@
                                        'activity' => $activity->toArray(),
                                        'img_go_home' => 
'rental/templates/base/images/32x32/actions/go-home.png',
                                        'editable' => true,
-                                       'dateformat'                            
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
                                );
 
                                $this->use_yui_editor('description');

Modified: trunk/logistic/templates/base/activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity_item.xsl     2012-10-01 06:59:05 UTC 
(rev 10064)
+++ trunk/logistic/templates/base/activity_item.xsl     2012-10-01 07:28:49 UTC 
(rev 10065)
@@ -51,7 +51,7 @@
                                                <xsl:choose>
                                                        <xsl:when 
test="editable">
                                                                <input 
class="date" id="start_date" name="start_date" type="text">
-                                                       <xsl:if 
test="activity/start_date != 0">
+                                                       <xsl:if 
test="activity/start_date != ''">
                                                        <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/start_date))"/></xsl:attribute>
                                                        </xsl:if>
                                                </input>        
@@ -68,7 +68,7 @@
                                                <xsl:choose>
                                                        <xsl:when 
test="editable">
                                                                <input 
class="date" id="end_date" name="end_date" type="text">
-                                                       <xsl:if 
test="activity/end_date != 0">
+                                                       <xsl:if 
test="activity/end_date != ''">
                                                        <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/end_date))"/></xsl:attribute>
                                                        </xsl:if>
                                                </input>        




reply via email to

[Prev in Thread] Current Thread [Next in Thread]