瀏覽代碼

Use the configurable date & time format for displaying the history of StopWatches.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4284 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 9 年之前
父節點
當前提交
23bd2d7b13
共有 1 個文件被更改,包括 6 次插入18 次删除
  1. 6 18
      core/attributedef.class.inc.php

+ 6 - 18
core/attributedef.class.inc.php

@@ -5474,7 +5474,7 @@ class AttributeStopWatch extends AttributeDefinition
 		case 'started':
 		case 'laststart':
 		case 'stopped':
-			$sHtml = (int)$sValue ? date(self::GetDateFormat(), (int)$sValue) : null;
+			$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
 			break;
 
 		default:
@@ -5488,7 +5488,7 @@ class AttributeStopWatch extends AttributeDefinition
 					switch($sThresholdCode)
 					{
 					case 'deadline':
-						$sHtml = (int)$sValue ? date(self::GetDateFormat(true /*full*/), (int)$sValue) : null;
+						$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
 						break;
 					case 'passed':
 						$sHtml = $this->GetBooleanLabel((int)$sValue);
@@ -5505,18 +5505,6 @@ class AttributeStopWatch extends AttributeDefinition
 		return $sHtml;
 	}
 
-	static protected function GetDateFormat($bFull = false)
-	{
-		if ($bFull)
-		{
-			return "Y-m-d H:i:s";
-		}
-		else
-		{
-			return "Y-m-d H:i";
-		}
-	}
-
 	public function GetSubItemAsPlainText($sItemCode, $value)
 	{
 		$sRet = $value;
@@ -5555,7 +5543,7 @@ class AttributeStopWatch extends AttributeDefinition
 							case 'deadline':
 								if ($value)
 								{
-									$sDate = date(self::GetDateFormat(true /* full */), $value);
+									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
 									$sRet = AttributeDeadline::FormatDeadline($sDate);
 								}
 								else
@@ -5615,7 +5603,7 @@ class AttributeStopWatch extends AttributeDefinition
 							case 'deadline':
 								if ($value)
 								{
-									$sDate = date(self::GetDateFormat(true /* full */), $value);
+									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
 									$sHtml = Str::pure2html(AttributeDeadline::FormatDeadline($sDate));
 								}
 								else
@@ -5756,7 +5744,7 @@ class AttributeStopWatch extends AttributeDefinition
 			}
 			else
 			{
-				$sRet = date(self::GetDateFormat(), $value);
+				$sRet = date((string)AttributeDateTime::GetFormat(), $value);
 			}
 			break;
 
@@ -5773,7 +5761,7 @@ class AttributeStopWatch extends AttributeDefinition
 					case 'deadline':
 						if ($value)
 						{
-							$sRet = date(self::GetDateFormat(true /*full*/), $value);
+							$sRet = date((string)AttributeDateTime::GetFormat(), $value);
 						}
 						else
 						{