From 1cb49786a91ec55e110c28860a78cac64f790b64 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 19 Aug 2014 06:12:52 +0000 Subject: [PATCH 1/2] * finish task #1964. --- lib/phpmailer/language/phpmailer.lang-zh-cn.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/phpmailer/language/phpmailer.lang-zh-cn.php b/lib/phpmailer/language/phpmailer.lang-zh-cn.php index a682bd0e02..e8030ed256 100644 --- a/lib/phpmailer/language/phpmailer.lang-zh-cn.php +++ b/lib/phpmailer/language/phpmailer.lang-zh-cn.php @@ -6,7 +6,7 @@ */ $PHPMAILER_LANG['authenticate'] = 'SMTP 错误：登录失败。\n请检查您设置的用户名密码是否正确。\n有的系统登录用户名是完整的邮箱地址。'; -$PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机，请确认禅道机器：\n1. 能ping通smtp服务器；\n2. 使用telnet 命令能够连接到smtp的发信端口;\n3. 如果上述步骤都是通的，windows请检查防火墙设置，linux请关闭selnux或者执行"setsebool httpd_can_sendmail true"允许apache可以发信。'; +$PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机，请确认禅道机器：\n1. 能ping通smtp服务器。如果不能ping通，请查看网络状态，或查看域名解析是否正确，或联系网管；\n2. 使用telnet 命令能够连接到smtp的发信端口;\n3. 如果上述步骤都是通的，windows请检查防火墙和杀毒软件设置，linux请关闭selnux或者执行"setsebool httpd_can_sendmail true"允许apache可以发信。'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误：数据不被接受。'; //$P$PHPMAILER_LANG['empty_message'] = 'Message body empty'; $PHPMAILER_LANG['encoding'] = '未知编码: '; @@ -18,7 +18,7 @@ $PHPMAILER_LANG['instantiate'] = '未知函数调用。'; //$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; $PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。'; $PHPMAILER_LANG['provide_address'] = '收件人没有设置邮箱，请到组织视图中检查下相应用户的email设置。'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误：收件人地址错误：'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误：收件人地址错误，或检查SMTP服务设置，是否允许发送该邮件地址：'; //$PHPMAILER_LANG['signing'] = 'Signing Error: '; //$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; //$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; From d75f0eb1eb1906837b20ae79daf7791ce877ed9e Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 19 Aug 2014 06:16:41 +0000 Subject: [PATCH 2/2] * adjust code. --- module/task/model.php | 19 +++++-------------- module/task/view/recordestimate.html.php | 4 ++-- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 877f870ec5..d1174519d3 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -918,8 +918,7 @@ class taskModel extends model */ public function getTaskEstimate($taskID) { - return $this->dao->select('*') - ->from(TABLE_TASKESTIMATE) + return $this->dao->select('*')->from(TABLE_TASKESTIMATE) ->where('task')->eq($taskID) ->orderBy('id') ->fetchAll(); @@ -934,14 +933,12 @@ class taskModel extends model */ public function getEstimateById($estimateID) { - $estimate = $this->dao->select('*') - ->from(TABLE_TASKESTIMATE) + $estimate = $this->dao->select('*')->from(TABLE_TASKESTIMATE) ->where('id')->eq($estimateID) ->fetch(); /* If the estimate is the last of its task, status of task will be checked. */ - $lastID = $this->dao->select('id') - ->from(TABLE_TASKESTIMATE) + $lastID = $this->dao->select('id')->from(TABLE_TASKESTIMATE) ->where('task')->eq($estimate->task) ->andWhere('id')->gt($estimate->id) ->fetch('id'); @@ -967,16 +964,10 @@ class taskModel extends model ->check('consumed', 'notempty') ->where('id')->eq((int)$estimateID) ->exec(); + $consumed = $task->consumed + $estimate->consumed - $oldEstimate->consumed; $lastEstimate = $this->dao->select('*')->from(TABLE_TASKESTIMATE)->where('task')->eq($task->id)->orderBy('id desc')->fetch(); - if($lastEstimate and $estimateID == $lastEstimate->id) - { - $left = $estimate->left; - } - else - { - $left = $task->left; - } + $left = ($lastEstimate and $estimateID == $lastEstimate->id) ? $estimate->left : $task->left; if($left == 0) $task->status = 'done'; $now = helper::now(); diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index bd4bdb4eb3..166e4c0c06 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -43,7 +43,7 @@ work;?> status == 'wait' or $task->status == 'doing') + if($task->status == 'wait' or $task->status == 'pause' or $task->status == 'doing') { common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true); common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'remove', 'hiddenwin', 'showinonlybody'); @@ -53,7 +53,7 @@ - status == 'wait' or $task->status == 'doing'):?> + status == 'wait' or $task->status =='pause' or $task->status == 'doing'):?> idAB;?>