Merge branch 'sgm_sprint195'

db/update17.0.beta1.sql

@@ -1,3 +1,5 @@
+ALTER TABLE `zt_task` ADD `fromIssue` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `fromBug`;
+
 ALTER TABLE `zt_kanbanspace` ADD COLUMN `activatedBy` char(30) NOT NULL AFTER `closedDate`;
 ALTER TABLE `zt_kanbanspace` ADD COLUMN `activatedDate` datetime NOT NULL AFTER `activatedBy`;
 

db/zentao.sql

@@ -1461,6 +1461,7 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
   `storyVersion` smallint(6) NOT NULL default '1',
   `designVersion` smallint(6) unsigned NOT NULL,
   `fromBug` mediumint(8) unsigned NOT NULL default '0',
+  `fromIssue` mediumint(8) unsigned NOT NULL default '0',
   `name` varchar(255) NOT NULL,
   `type` varchar(20) NOT NULL,
   `pri` tinyint(3) unsigned NOT NULL default '0',

module/task/control.php

@@ -1383,6 +1383,19 @@ class task extends control
             {
                 $task      = $this->task->getById($taskID);
                 $execution = $this->execution->getByID($task->execution);
+
+                if(isset($task->fromIssue) and $task->fromIssue > 0)
+                {
+                    $fromIssue = $this->loadModel('issue')->getByID($task->fromIssue);
+                    if($fromIssue->status != 'closed')
+                    {
+                        $confirmURL = $this->createLink('issue', 'close', "id=$task->fromIssue");
+                        unset($_GET['onlybody']);
+                        $cancelURL  = $this->createLink('task', 'view', "taskID=$taskID");
+                        return print(js::confirm(sprintf($this->lang->task->remindIssue, $task->fromIssue), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
+                    }
+                }
+
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
                     $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;

module/task/lang/en.php

@@ -216,6 +216,7 @@ $lang->task->afterSubmit            = "Next ";
 $lang->task->successSaved           = "Created!";
 $lang->task->delayWarning           = " <strong class='text-danger'> Delay %s days </strong>";
 $lang->task->remindBug              = "This task is converted from a bug. Do you want to update the Bug:%s?";
+$lang->task->remindIssue            = "This task is converted from a issue. Do you want to update the Issue:%s?";
 $lang->task->confirmChangeExecution = "If you change {$lang->executionCommon}, Module, Story and AssignedTo will also be changed. Do you want to change it?";
 $lang->task->confirmFinish          = '"Left Hour" is 0. Do you want to change the status to "Finished"?';
 $lang->task->confirmRecord          = '"Left Hour" is 0. Do you want to set the task as "Finished"?';

module/task/lang/zh-cn.php

@@ -216,6 +216,7 @@ $lang->task->afterSubmit            = "添加之后";
 $lang->task->successSaved           = "成功添加，";
 $lang->task->delayWarning           = " <strong class='text-danger'> 延期%s天 </strong>";
 $lang->task->remindBug              = "该任务为Bug转化得到，是否更新Bug:%s ?";
+$lang->task->remindIssue            = "该任务为问题转化得到，是否更新问题:%s ?";
 $lang->task->confirmChangeExecution = "修改{$lang->executionCommon}会导致相应的所属模块、相关{$lang->SRCommon}和指派人发生变化，确定吗？";
 $lang->task->confirmFinish          = '"预计剩余"为0，确认将任务状态改为"已完成"吗？';
 $lang->task->confirmRecord          = '"剩余"为0，任务将标记为"已完成"，您确定吗？';