From d35eb8dfafeaef4787a857f544362b5fa3d51236 Mon Sep 17 00:00:00 2001
From: yfl <554665488@qq.com>
Date: Wed, 24 Apr 2019 15:59:56 +0800
Subject: [PATCH] * Finsish task #5379,#5385,#5389,#5393,#5403,5409

---
 module/bug/css/create.css       |  1 +
 module/misc/lang/zh-cn.php      |  1 -
 module/project/model.php        |  2 +-
 module/story/js/view.js         |  5 +++++
 module/story/view/view.html.php |  3 ++-
 module/task/lang/zh-cn.php      |  5 +++++
 module/task/model.php           | 12 ++++++++++++
 module/task/view/view.html.php  |  2 +-
 8 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index 881b8f6efd..a093073161 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -45,3 +45,4 @@
 .title-group #severity + .chosen-container > .chosen-single {border-radius: 0!important;}
 .title-group #pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;}
 .title-group .has-icon-right{min-width:700px}
+#dataform .chosen[name ^= "os"] + .chosen-container .chosen-drop{min-width: 200px} 
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index a79da9eb40..5ad7e19b89 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -41,7 +41,6 @@ $lang->misc->zentao->support['ask']        = "官方问答";
 $lang->misc->zentao->support['video']      = "使用视频";
 $lang->misc->zentao->support['qqgroup']    = "官方QQ群";
 
-$lang->misc->zentao->cowin['donate']       = "捐助我们";
 $lang->misc->zentao->cowin['reportbug']    = "汇报Bug";
 $lang->misc->zentao->cowin['feedback']     = "反馈需求";
 $lang->misc->zentao->cowin['recommend']    = "推荐给朋友";
diff --git a/module/project/model.php b/module/project/model.php
index 64a726a0d2..fd69a33160 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -610,7 +610,7 @@ class projectModel extends model
             $tasks = $this->dao->select('id,estStarted,deadline,status')->from(TABLE_TASK)
                 ->where('deadline')->ne('0000-00-00')
                 ->andWhere('status')->in('wait,doing')
-                ->andWhere('project')->eq($project->id)
+                ->andWhere('project')->eq($projectID)
                 ->fetchAll();
             foreach($tasks as $task)
             {
diff --git a/module/story/js/view.js b/module/story/js/view.js
index 180672d6e5..090486d5cd 100644
--- a/module/story/js/view.js
+++ b/module/story/js/view.js
@@ -5,4 +5,9 @@ $(function()
         link = createLink('story', 'create', 'productID=' + productID + "&branch=" + branch + '&moduleID=' + moduleID);
         $('#modulemenu ul.nav li.right:first').before("<li class='right'><a href='" + link + "'><i class='icon-story-create icon-plus'></i> " + createStory + "</a></li>");
     }
+    
+    if(isonlybody)
+    {
+        $('.main-actions').css('width', '100%')
+    }
 });
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index a2defc6e27..651c87e670 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -14,6 +14,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php $browseLink = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch&moduleID=$story->module");?>
 <?php js::set('sysurl', common::getSysUrl());?>
+<?php js::set('isonlybody', isonlybody());?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php if(!isonlybody()):?>
@@ -105,7 +106,7 @@
 
         echo "<div class='divider'></div>";
         common::printIcon('story', 'edit', "storyID=$story->id", $story);
-        common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', 'iframe showinonlybody', true, "data-width='1050'");
+        common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', '', true, "data-width='1050'");
         common::printIcon('story', 'delete', "storyID=$story->id", $story, 'button', 'trash', 'hiddenwin');
         ?>
         <?php endif;?>
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 3670c92e33..1fc693465c 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -274,3 +274,8 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = '关闭原因';
 
 $lang->task->report->finishedTasksPerDay->type             = 'bar';
 $lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期';
+
+$lang->task->action = new stdclass();
+$lang->task->action->batchcreate = array('main' => '$date, 由 <strong>$actor</strong> 创建子任务 。');
+$lang->task->action->unlink      = array('main' => '$date, 由 <strong>$actor</strong> 取消关联父任务 。');
+$lang->task->action->linkto      = array('main' => '$date, 由 <strong>$actor</strong> 关联到父任务 。');
diff --git a/module/task/model.php b/module/task/model.php
index 053b01ba93..3e8e9355eb 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -289,6 +289,8 @@ class taskModel extends model
             if($task->estimate) $task->estimate = (float)$task->estimate;
         }
 
+        $childTasks = null;
+        
         foreach($data as $i => $task)
         {
             $this->dao->insert(TABLE_TASK)->data($task)
@@ -300,6 +302,7 @@ class taskModel extends model
             if(dao::isError()) die(js::error(dao::getError()));
 
             $taskID = $this->dao->lastInsertID();
+            $childTasks .= html::a(helper::createLink('task', 'view', 'taskID=' . $taskID), $task->name, '', "title='$task->name' class='text-ellipsis w-p10'") .  ',';
             if($story) $this->story->setStage($task->story);
             $actionID = $this->action->create('task', $taskID, 'Opened', '');
             if(!dao::isError()) $this->loadModel('score')->create('task', 'create', $taskID);
@@ -315,6 +318,7 @@ class taskModel extends model
             $this->updateParentStatus($taskID);
             $this->computeBeginAndEnd($parentID);
             $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($parentID)->exec();
+            $this->action->create('task', $parentID, 'batchCreate', $childTasks);
         }
         return $mails;
     }
@@ -673,6 +677,14 @@ class taskModel extends model
             $this->dao->update(TABLE_TASK)->set('project')->eq($task->project)->set('module')->eq($task->module)->where('parent')->eq($taskID)->exec();
         }
 
+        if(isset($task->parent) and $task->parent != $oldTask->parent)
+        {
+            $comment = html::a(helper::createLink('task', 'view', 'taskID=' . $taskID), $task->name);
+            $this->loadModel('action')->create('task', $task->parent, 'linkTo', $comment);
+            $this->loadModel('action')->create('task', $oldTask->parent, 'unLink', $comment);
+        
+        }
+
         $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->edit['id'], $this->post->uid);
 
         $teams = array();
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index a733d9d4ce..1064df95d7 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -167,7 +167,7 @@
         common::printIcon('task', 'edit', "taskID=$task->id", $task, 'button', '', '', 'showinonlybody');
         common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy');
         common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', 'trash', 'hiddenwin');
-
+        if($task->parent <= 0) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'treemap-alt', '', '', '', '', $this->lang->task->children);
         if($task->parent > 0) echo html::a(helper::createLink('task', 'view', "taskID=$task->parent"), "<i class='icon icon-chevron-double-up'></i>", '', "class='btn btn-link' title='{$lang->task->parent}'");
         ?>
         <?php endif;?>