From ef7000ff45f28c8949d8b75084026c55288648b9 Mon Sep 17 00:00:00 2001
From: pengjiangxiu <riverdream@yeah.net>
Date: Fri, 18 Aug 2017 15:20:13 +0800
Subject: [PATCH 1/3] * Adjust code.

---
 module/doc/view/showfiles.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index 8a0633472f..7ccf5fc292 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -78,8 +78,8 @@
           <td><?php echo isset($file->addedDate) ? substr($file->addedDate, 0, 10) : '';?></td>
           <td class='text-center'>
             <?php
-            commonModel::printLink('file', 'download', "fileID=$file->id", $lang->doc->download, "data-toggle='modal'");
-            commonModel::printLink('file', 'delete',   "fileID=$file->id", $lang->delete, "class='deleter'");
+            common::printLink('file', 'download', "fileID=$file->id", $lang->doc->download, "data-toggle='modal'");
+            common::printLink('file', 'delete',   "fileID=$file->id", $lang->delete, 'hiddenwin');
             ?>
           </td>
         </tr>

From 4db02b2d4e1005d65a31491454bf307e2776ef84 Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Fri, 18 Aug 2017 16:20:24 +0800
Subject: [PATCH 2/3]  * Fix Bug # 1200

---
 module/task/js/batchcreate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js
index eb80ae51c1..932bf12594 100755
--- a/module/task/js/batchcreate.js
+++ b/module/task/js/batchcreate.js
@@ -50,7 +50,7 @@ function setStoryRelated(num)
         var link = createLink('story', 'ajaxGetModule', 'storyID=' + storyID);
         $.get(link, function(moduleID)
         {
-            $('#module' + num).val(moduleID);
+            $('#module' + num).val(parseInt(moduleID));
             $('#module' + num).trigger("chosen:updated");
         });
     }

From f294f9b18188e971b415c2355d4a3c9c5a04fc7d Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Fri, 18 Aug 2017 16:26:28 +0800
Subject: [PATCH 3/3]  * Fix Bug #1195.

---
 module/project/config.php             | 11 ++++++-----
 module/project/view/activate.html.php |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/project/config.php b/module/project/config.php
index b25686b377..ddd4c26299 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -18,11 +18,12 @@ $config->project->custom = new stdclass();
 $config->project->custom->batchEditFields = 'days,status,PM';
 
 $config->project->editor = new stdclass();
-$config->project->editor->create  = array('id' => 'desc',    'tools' => 'simpleTools');
-$config->project->editor->edit    = array('id' => 'desc',    'tools' => 'simpleTools');
-$config->project->editor->putoff  = array('id' => 'comment', 'tools' => 'simpleTools');
-$config->project->editor->close   = array('id' => 'comment', 'tools' => 'simpleTools');
-$config->project->editor->suspend = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->project->editor->create   = array('id' => 'desc',    'tools' => 'simpleTools');
+$config->project->editor->edit     = array('id' => 'desc',    'tools' => 'simpleTools');
+$config->project->editor->putoff   = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->project->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->project->editor->close    = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->project->editor->suspend  = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->project->search['module']                   = 'task';
 $config->project->search['fields']['name']           = $lang->task->name;
diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php
index cd609b3306..59a7fd7b46 100644
--- a/module/project/view/activate.html.php
+++ b/module/project/view/activate.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <div class='container'>
   <div id='titlebar'>