From 117096919d10b79ef9624394cc765389e1d238da Mon Sep 17 00:00:00 2001
From: tengfei
Date: Wed, 20 Dec 2017 16:13:43 +0800
Subject: [PATCH 1/2] bug open on change
---
module/bug/lang/en.php | 2 +-
module/common/lang/en.php | 4 ++--
module/install/lang/en.php | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 8f983f6bb3..dad314be53 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -39,7 +39,7 @@ $lang->bug->toStory = 'Convert to Story';
$lang->bug->mailto = 'Mail To';
$lang->bug->openedBy = 'Open By';
$lang->bug->openedDate = 'Open On';
-$lang->bug->openedDateAB = 'Open On';
+$lang->bug->openedDateAB = 'Created on';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'Assigned To';
$lang->bug->assignedDate = 'Assigned On';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 4e9f5138df..234cf9a988 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -93,8 +93,8 @@ $lang->workingHour = 'Hour';
$lang->idAB = 'ID';
$lang->priAB = 'P';
$lang->statusAB = 'Status';
-$lang->openedByAB = 'Open';
-$lang->assignedToAB = 'To';
+$lang->openedByAB = 'Created by';
+$lang->assignedToAB = 'Assignee';
$lang->typeAB = 'Type';
$lang->common = new stdclass();
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index 09e9e79755..f6eb6ac942 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -162,7 +162,7 @@ $lang->install->login = 'Login ZenTao';
$lang->install->register = 'Register in ZenTao';
$lang->install->joinZentao = <<Tou have installed ZenTao %s. Please delete install.php asap.
Note: In order to get the latest news of ZenTao, please register in ZenTao(www.zentao.pm).
+You have installed ZenTao %s. Please delete install.php asap.
Note: In order to get the latest news of ZenTao, please register in ZenTao(www.zentao.pm).
EOT;
$lang->install->product = array('chanzhi', 'ranzhi');
From 40a653554d0143b70cf110e3afcdc90ab1013a46 Mon Sep 17 00:00:00 2001
From: Your Name
Date: Wed, 20 Dec 2017 16:25:25 +0800
Subject: [PATCH 2/2] * Fix Bug #1245.
---
module/bug/model.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/module/bug/model.php b/module/bug/model.php
index 7683e0f71d..0fc4a2dffd 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2459,7 +2459,8 @@ class bugModel extends model
echo substr($bug->openedDate, 5, 11);
break;
case 'openedBuild':
- foreach(explode(',', $bug->openedBuild) as $build) echo zget($builds, $build) . ' ';
+ $builds = array_flip($builds);
+ foreach(explode(',', $bug->openedBuild) as $build) echo html::a(helper::createLink('build', 'view', "buildID=$builds[$build]"), $build, '', "title='$bug->openedBuild'");
break;
case 'assignedTo':
echo zget($users, $bug->assignedTo, $bug->assignedTo);