[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9435]
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [9435] |
Date: |
Thu, 24 May 2012 11:23:04 +0000 |
Revision: 9435
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9435
Author: erikhl
Date: 2012-05-24 11:23:03 +0000 (Thu, 24 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uiprocedure.inc.php
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2012-05-24 11:01:56 UTC
(rev 9434)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2012-05-24 11:23:03 UTC
(rev 9435)
@@ -414,9 +414,13 @@
$procedures_array =
$this->so->get_procedures_by_control_area($control_area_id);
if(count($procedures_array)>0)
+ {
return json_encode( $procedures_array );
+ }
else
+ {
return null;
+ }
}
@@ -470,11 +474,17 @@
$procedure_array = $procedure->toArray();
if($procedure->get_start_date() &&
$procedure->get_start_date() != null)
+ {
$procedure_start_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_start_date());
+ }
if($procedure->get_end_date() &&
$procedure->get_end_date() != null)
+ {
$procedure_end_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_end_date());
+ }
if($procedure->get_revision_date() &&
$procedure->get_revision_date() != null)
- $procedure_revision_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_revision_date());
+ {
+ $procedure_revision_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_revision_date());
+ }
if(!$view_revision)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9435],
Erik Holm-Larsen <=