%s。
EOT;
diff --git a/module/mail/model.php b/module/mail/model.php
index f2e2320e2e..4e7e715ae4 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -304,8 +304,11 @@ class mailModel extends model
$this->clear();
/* Replace full webPath image for mail. */
+ $isonlybody = isonlybody();
+ unset($_GET['onlybody']);
$sysURL = zget($this->config->mail, 'domain', common::getSysURL());
$readLinkReg = str_replace(array('%fileID%', '/', '.', '?'), array('[0-9]+', '\/', '\.', '\?'), helper::createLink('file', 'read', 'fileID=(%fileID%)', '\w+'));
+ if($isonlybody) $_GET['onlybody'] = 'yes';
$body = preg_replace('/ src="(' . $readLinkReg . ')" /', ' src="' . $sysURL . '$1" ', $body);
$body = preg_replace('/ src="{([0-9]+)(\.(\w+))?}" /', ' src="' . $sysURL . helper::createLink('file', 'read', "fileID=$1", "$3") . '" ', $body);
diff --git a/module/message/model.php b/module/message/model.php
index a5cfdd6c89..d465273d35 100644
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -84,6 +84,13 @@ class messageModel extends model
if(isset($messageSetting['webhook']))
{
$actions = $messageSetting['webhook']['setting'];
+ if($this->app->isFlow)
+ {
+ $rawModule = $this->app->rawModule;
+ $rawMethod = $this->app->rawMethod;
+ $actions[$rawModule][] = $rawMethod;
+ }
+
if(isset($actions[$objectType]) and in_array($actionType, $actions[$objectType]))
{
$this->loadModel('webhook')->send($objectType, $objectID, $actionType, $actionID, $actor);
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index 50e25df32d..64453fc1c2 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -70,6 +70,8 @@ $lang->misc->connectFail = "Failed to connect to the database. Error: %s，See now .';
$lang->misc->noticeRepair = "Wenn Sie kein Administrator sind, konaktieren Sie bitte den Administrator um die Tabelle zu reparieren.
Wenn Sie Administrtor sind, melden Sie sich bitte am Host an und erstellen Sie eine Datei mit dem Namen %s .
@@ -83,6 +85,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Letzte Version';
$lang->misc->feature->detailed = 'Details';
+$lang->misc->releaseDate['12.0'] = '2020-01-03';
$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
@@ -119,6 +122,10 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['12.0'][] = array('title'=>'Move repo function to zentao', 'desc' => '');
+$lang->misc->feature->all['12.0'][] = array('title'=>'Add annual summary', 'desc' => 'Show annual summary by role.');
+$lang->misc->feature->all['12.0'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
+
$lang->misc->feature->all['11.7'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Added choices for users to choose agile or not.
Added WeChat Enterprise to the types of webhook
Added the notifier of Dingding personal messages
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'Fix bug.', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 91856d6989..143589e321 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -70,6 +70,8 @@ $lang->misc->connectFail = "Failed to connect to the database. Error: %s，See now .';
$lang->misc->noticeRepair = "If you are not Administrator, contact your ZenTao Administrator to repair tables.
If you are the Administrator, login your ZenTao host and create a file named %s .
@@ -83,6 +85,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Latest Version';
$lang->misc->feature->detailed = 'Detail';
+$lang->misc->releaseDate['12.0'] = '2020-01-03';
$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
@@ -119,6 +122,10 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['12.0'][] = array('title'=>'Move repo function to zentao', 'desc' => '');
+$lang->misc->feature->all['12.0'][] = array('title'=>'Add annual summary', 'desc' => 'Show annual summary by role.');
+$lang->misc->feature->all['12.0'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
+
$lang->misc->feature->all['11.7'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Added choices for users to choose agile or not.
Added WeChat Enterprise to the types of webhook
Added the notifier of Dingding personal messages
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'Fix bug.', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index 811f28779d..178c461b27 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -70,6 +70,8 @@ $lang->misc->connectFail = "Echec de connexion à la Base de données. Erreur: %
$lang->misc->tableName = "Nom de la Table";
$lang->misc->tableStatus = "Statut";
$lang->misc->novice = "Nouveau dans ZenTao ? Voulez-vous commencer le Tutoriel ?";
+$lang->misc->showAnnual = 'Add annual summary';
+$lang->misc->annualDesc = 'After version 12.0, the new annual report function can be viewed on the 『Report->Annual Summary』 page. See now .';
$lang->misc->noticeRepair = "Si vous n'êtes pas l'administrateur, contactez votre administrateur ZenTao pour réparer les tables.
Si vous êtes l'administrateur, connectez-vous à votre serveur ZenTao et créez un fichier vide dont le nom est %s .
@@ -83,6 +85,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Dernière Version';
$lang->misc->feature->detailed = 'Détail';
+$lang->misc->releaseDate['12.0'] = '2020-01-03';
$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
@@ -119,6 +122,10 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['12.0'][] = array('title'=>'Move repo function to zentao', 'desc' => '');
+$lang->misc->feature->all['12.0'][] = array('title'=>'Add annual summary', 'desc' => 'Show annual summary by role.');
+$lang->misc->feature->all['12.0'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
+
$lang->misc->feature->all['11.7'][] = array('title'=>'Optimize details and fix bug.', 'desc' => 'Added choices for users to choose agile or not.
Added WeChat Enterprise to the types of webhook
Added the notifier of Dingding personal messages
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'Fix bug.', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 8349e39866..7afd3073b3 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -70,6 +70,8 @@ $lang->misc->connectFail = "连接数据库失败，错误：%s，查看 ';
$lang->misc->noticeRepair = "普通用户请联系管理员进行修复
管理员请登录禅道所在的服务器，创建%s 文件。
@@ -83,6 +85,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '详情';
+$lang->misc->releaseDate['12.0'] = '2020-01-03';
$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
@@ -119,6 +122,10 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['12.0'][] = array('title'=>'将代码功能版本浏览功能转移到开源版', 'desc' => '');
+$lang->misc->feature->all['12.0'][] = array('title'=>'增加年度总结', 'desc' => '根据角色显示年度总结。');
+$lang->misc->feature->all['12.0'][] = array('title'=>'完善细节，修复Bug', 'desc' => '');
+
$lang->misc->feature->all['11.7'][] = array('title'=>'完善细节，修复Bug', 'desc' => '增加用户是否使用敏捷概念的选择
webhook类型中增加企业微信
实现到钉钉个人消息的通知
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'修复Bug', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'完善细节，修复Bug', 'desc' => '');
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 48a886ce68..cc455f7ce8 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -70,6 +70,8 @@ $lang->misc->connectFail = "連接資料庫失敗，錯誤：%s，查看 ';
$lang->misc->noticeRepair = "普通用戶請聯繫管理員進行修復
管理員請登錄禪道所在的伺服器，創建%s 檔案。
@@ -83,6 +85,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '詳情';
+$lang->misc->releaseDate['12.0'] = '2020-01-03';
$lang->misc->releaseDate['11.7'] = '2019-11-28';
$lang->misc->releaseDate['11.6.5'] = '2019-11-08';
$lang->misc->releaseDate['11.6.4'] = '2019-10-17';
@@ -119,6 +122,10 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['12.0'][] = array('title'=>'將代碼功能版本瀏覽功能轉移到開源版', 'desc' => '');
+$lang->misc->feature->all['12.0'][] = array('title'=>'增加年度總結', 'desc' => '根據角色顯示年度總結。');
+$lang->misc->feature->all['12.0'][] = array('title'=>'完善細節，修復Bug', 'desc' => '');
+
$lang->misc->feature->all['11.7'][] = array('title'=>'完善細節，修復Bug', 'desc' => '增加用戶是否使用敏捷概念的選擇
webhook類型中增加企業微信
實現到釘釘個人消息的通知
');
$lang->misc->feature->all['11.6.5'][] = array('title'=>'修復Bug', 'desc' => '');
$lang->misc->feature->all['11.6.4'][] = array('title'=>'完善細節，修復Bug', 'desc' => '');
diff --git a/module/my/control.php b/module/my/control.php
index 9bd379a8b0..1f72c3595c 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -184,7 +184,8 @@ class my extends control
/* Append id for secend sort. */
$sort = $this->loadModel('common')->appendOrder($orderBy);
-
+ $this->loadModel('product');
+
/* Assign. */
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->task;
$this->view->position[] = $this->lang->my->task;
diff --git a/module/my/css/managecontacts.css b/module/my/css/managecontacts.css
index 851d840f30..a94b78812d 100644
--- a/module/my/css/managecontacts.css
+++ b/module/my/css/managecontacts.css
@@ -1,3 +1,5 @@
body.body-modal {padding-bottom: 20px; min-height: 400px}
.side-col {padding-right: 40px; padding-top: 25px;}
+
+.btn-block {display: block; width: 100%; text-overflow: ellipsis; white-space: nowrap; overflow: hidden;}
\ No newline at end of file
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 7f7c6620ef..ac5935b9fe 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -5,9 +5,9 @@ $lang->my->common = 'Dashboard';
$lang->my->index = 'Home';
$lang->my->todo = 'Meine ToDos';
$lang->my->calendar = 'Kalender';
-$lang->my->task = 'Meine aufgaben';
-$lang->my->bug = 'Meine Bugs';
-$lang->my->testTask = 'Meine Builds';
+$lang->my->task = 'Aufgaben';
+$lang->my->bug = 'Bugs';
+$lang->my->testTask = 'Builds';
$lang->my->testCase = 'Meine Fälle';
$lang->my->story = 'Meine Storys';
$lang->my->myProject = "Meine {$lang->projectCommon}";
diff --git a/module/my/view/managecontacts.html.php b/module/my/view/managecontacts.html.php
index 5edcaa0200..5f1c438fea 100644
--- a/module/my/view/managecontacts.html.php
+++ b/module/my/view/managecontacts.html.php
@@ -19,7 +19,7 @@
{
$listClass = ($id == $listID) ? 'btn btn-block active' : 'btn btn-block';
$shareIcon = in_array($id, $globalContacts) ? 'consumed;?>
left;?>
'>deadline, 0, 4) > 0) echo $task->deadline;?>
- processStatus('task', $task);?>
+ storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion);?>
+ {$this->lang->story->changed}") : print(" " . $this->processStatus('task', $task) . " ");?>
+
needConfirm)
diff --git a/module/product/model.php b/module/product/model.php
index 0a72a4b576..35085b1af5 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -39,7 +39,7 @@ class productModel extends model
if($currentModule == 'story')
{
if($currentMethod != 'create' and $currentMethod != 'batchcreate') $currentModule = 'product';
- if($currentMethod == 'view') $currentMethod = 'browse';
+ if($currentMethod == 'view' || $currentMethod == 'change' || $currentMethod == 'review') $currentMethod = 'browse';
}
if($currentMethod == 'report') $currentMethod = 'browse';
@@ -339,6 +339,58 @@ class productModel extends model
$products = $this->dao->select('id, name, status')->from(TABLE_PRODUCT)->where('deleted')->eq(0)->fetchGroup('status');
}
+ /**
+ * Get ordered products
+ *
+ * @param string $status
+ * @param int $num
+ * @access public
+ * @return array
+ */
+ public function getOrderedProducts($status, $num = 0)
+ {
+ $products = $this->getList($status);
+ if(empty($products)) return $products;
+
+ $lines = $this->loadModel('tree')->getLinePairs($useShort = true);
+ $productList = array();
+ foreach($lines as $id => $name)
+ {
+ foreach($products as $key => $product)
+ {
+ if($product->line == $id)
+ {
+ $product->name = $name . '/' . $product->name;
+ $productList[] = $product;
+ unset($products[$key]);
+ }
+ }
+ }
+ $productList = array_merge($productList, $products);
+
+ $products = $mineProducts = $otherProducts = $closedProducts = array();
+ foreach($productList as $product)
+ {
+ if(!$this->app->user->admin and !$this->checkPriv($product->id)) continue;
+ if($product->status == 'normal' and $product->PO == $this->app->user->account)
+ {
+ $mineProducts[$product->id] = $product;
+ }
+ elseif($product->status == 'normal' and $product->PO != $this->app->user->account)
+ {
+ $otherProducts[$product->id] = $product;
+ }
+ elseif($product->status == 'closed')
+ {
+ $closedProducts[$product->id] = $product;
+ }
+ }
+ $products = $mineProducts + $otherProducts + $closedProducts;
+
+ if(empty($num)) return $products;
+ return array_slice($products, 0, $num, true);
+ }
+
/**
* Create a product.
*
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 8a7709bade..51617dcc8d 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -53,7 +53,6 @@
-
+
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index d6f6693d8f..0aaf79a042 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -34,7 +34,7 @@
projectCommon;?>
- project->code;?>
+ project->code;?>
project->end;?>
project->status;?>
project->totalEstimate;?>
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 3b8225b480..51dc5e9bc8 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -67,7 +67,7 @@ class productplan extends control
$begin = date('Y-m-d', strtotime("+$delta days", $timestamp));
}
- $this->view->begin = $lastPlan ? $begin : '';
+ $this->view->begin = $lastPlan ? $begin : date('Y-m-d');
if($parent) $this->view->parentPlan = $this->productplan->getById($parent);
$this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->productplan->create;
diff --git a/module/productplan/css/batchedit.css b/module/productplan/css/batchedit.css
new file mode 100644
index 0000000000..ff2e0c8454
--- /dev/null
+++ b/module/productplan/css/batchedit.css
@@ -0,0 +1,2 @@
+.form-input-hidden{display: none;}
+.form-input-show{display: block;}
\ No newline at end of file
diff --git a/module/productplan/css/browse.css b/module/productplan/css/browse.css
index a37d6173a9..8af378e3e8 100644
--- a/module/productplan/css/browse.css
+++ b/module/productplan/css/browse.css
@@ -1,6 +1,5 @@
-.table td.content { position: relative;}
-.table td.content .more{height:25px; position:absolute; right:-5px; top:5px;}
-.table td.content div{height:25px;overflow:hidden; text-overflow:ellipsis; white-space:nowrap; padding-right:5px;}
+.table td.content div{height:25px;overflow:hidden; text-overflow:ellipsis; white-space:nowrap; float:left; max-width: calc(100% - 20px)}
+.table td.content .more{height:25px; float:left;}
td.c-branch{ overflow:hidden; text-align:left!important; text-overflow:ellipsis; white-space:nowrap;}
.table-children {border-left: 2px solid #cbd0db; border-right: 2px solid #cbd0db;}
diff --git a/module/productplan/js/batchedit.js b/module/productplan/js/batchedit.js
new file mode 100644
index 0000000000..24aa449593
--- /dev/null
+++ b/module/productplan/js/batchedit.js
@@ -0,0 +1,24 @@
+/**
+ * Handle the product plan pending status. Fix bug #2937.
+ *
+ * @param int planID
+ * @access public
+ * @return date
+ */
+function changeDate(planID)
+{
+ if($("#future"+planID).prop('checked'))
+ {
+ $("input[name='begin["+planID+"]']").val('2030-01-01').removeClass('form-input-show').addClass('form-input-hidden');
+ $("input[name='end["+planID+"]']").val('2030-01-01').removeClass('form-input-show').addClass('form-input-hidden');
+ $("input[name='begin"+planID+"']").val('').removeClass('form-input-hidden').addClass('form-input-show');
+ $("input[name='end"+planID+"']").val('').removeClass('form-input-hidden').addClass('form-input-show');
+ }
+ else
+ {
+ $("input[name='begin["+planID+"]']").val('').removeClass('form-input-hidden').addClass('form-input-show');
+ $("input[name='end["+planID+"]']").val('').removeClass('form-input-hidden').addClass('form-input-show');
+ $("input[name='begin"+planID+"']").removeClass('form-input-show').addClass('form-input-hidden');
+ $("input[name='end"+planID+"']").removeClass('form-input-show').addClass('form-input-hidden');
+ }
+};
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index 83520e0203..17281b7eb3 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -12,10 +12,11 @@ $(function()
{
$('#productplanList tbody tr').each(function()
{
- var content = $(this).find('td.content div').html();
+ var $content = $(this).find('td.content');
+ var content = $content.find('div').html();
if(content.indexOf('= 0)
{
- $(this).find('td.content').append("productplan->desc?>
productplan->begin?>
productplan->end?>
+ productplan->future?>
+ begin == '2030-01-01' || $plan->end == '2030-01-01') ? 'form-input-hidden' : 'form-input-show';?>
+ begin == '2030-01-01' || $plan->end == '2030-01-01') ? 'form-input-show' : 'form-input-hidden';?>
+ begin == '2030-01-01' || $plan->end == '2030-01-01') ? 'checked="checked"' : '';?>
id . html::hidden("id[$plan->id]", $plan->id);?>
id]", $plan->title, "class='form-control'")?>
id]", $plan->desc, "class='form-control' rows='1'")?>
- id]", $plan->begin, "class='form-control form-date'")?>
- id]", $plan->end, "class='form-control form-date'")?>
+ id]", $plan->begin, "class='form-control form-date $hiddenInput'");echo html::input("begin$plan->id", '', "class='form-control $showInput' disabled='disabled'");?>
+ id]", $plan->end, "class='form-control form-date $hiddenInput'");echo html::input("end$plan->id", '', "class='form-control $showInput' disabled='disabled'");?>
+ productplan->future;?>
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index fbfdede0e9..2143c0f17b 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -112,7 +112,7 @@
hour;?>
projectID)) echo html::a(helper::createLink('project', 'task', 'projectID=' . $plan->projectID), '
- ", "\n", str_replace(array("\n", "\r"), '', $plan->desc)));?>
+ ', '
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index b1f8beaddf..cf9ef82001 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
?>
-
+
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index 70fe264d28..199c4190da 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
?>
-
+
diff --git a/module/project/control.php b/module/project/control.php
index 1a4846a4a3..89b4fa5168 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1104,9 +1104,12 @@ class project extends control
$this->executeHooks($projectID);
$planID = '';
- foreach($_POST['plans'] as $planID)
+ if(isset($_POST['plans']))
{
- if(!empty($planID)) break;
+ foreach($_POST['plans'] as $planID)
+ {
+ if(!empty($planID)) break;
+ }
}
if(!empty($planID))
{
diff --git a/module/project/css/common.css b/module/project/css/common.css
index 450076be5e..85f7091fc3 100644
--- a/module/project/css/common.css
+++ b/module/project/css/common.css
@@ -13,7 +13,7 @@
.table-children {border-left: 2px solid #cbd0db; border-right: 2px solid #cbd0db;}
.table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
.table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
-.table td.has-child > a {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+.table td.has-child > a:not(.task-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
.table td.has-child > .task-toggle {color: #838a9d; position: relative; top: 1px;}
.table td.has-child > .task-toggle:hover {color: #006af1; cursor: pointer;}
.table td.has-child > .task-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform:rotate(-90deg); -moz-transform:rotate(-90deg); -o-transform:rotate(-90deg); -webkit-transform:rotate(-90deg); transform: rotate(-90deg);}
diff --git a/module/project/js/task.js b/module/project/js/task.js
index df6b507777..ac43b0609f 100644
--- a/module/project/js/task.js
+++ b/module/project/js/task.js
@@ -3,8 +3,10 @@ $(function()
if($('#taskList thead th.c-name').width() < 150) $('#taskList thead th.c-name').width(150);
$('#taskList td.has-child .task-toggle').each(function()
{
- $td = $(this).closest('td');
- $td.find('a').eq(0).css('max-width', $td.width() - $td.find('.label').width() - 40);
+ var $td = $(this).closest('td');
+ var labelWidth = 0;
+ if($td.find('.label').length > 0) labelWidth = $td.find('.label').width();
+ $td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60);
});
});
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index dec5979c28..a8d0201886 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -143,7 +143,7 @@ $lang->project->linkedProducts = '已关联';
$lang->project->unlinkedProducts = '未关联';
$lang->project->view = "{$lang->projectCommon}概况";
$lang->project->startAction = "开始{$lang->projectCommon}";
-$lang->project->activateAction = "计划{$lang->projectCommon}";
+$lang->project->activateAction = "激活{$lang->projectCommon}";
$lang->project->delayAction = "延期{$lang->projectCommon}";
$lang->project->suspendAction = "挂起{$lang->projectCommon}";
$lang->project->closeAction = "关闭{$lang->projectCommon}";
@@ -176,7 +176,7 @@ $lang->project->treeOnlyTask = '树状图只看任务';
$lang->project->treeOnlyStory = "树状图只看{$lang->storyCommon}";
$lang->project->storyKanban = "{$lang->storyCommon}看板";
$lang->project->storySort = "{$lang->storyCommon}排序";
-$lang->project->importPlanStory = "创建" . $lang->projectCommon . "成功！\n是否导入计划关联的相关{$lang->storyCommon}？";
+$lang->project->importPlanStory = '创建' . $lang->projectCommon . '成功！\n是否导入计划关联的相关' . $lang->storyCommon . '？';
$lang->project->iteration = '版本迭代';
$lang->project->iterationInfo = '迭代%s次';
$lang->project->viewAll = '查看所有';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 1493254b17..7a9a75d2f5 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -176,7 +176,7 @@ $lang->project->treeOnlyTask = '樹狀圖只看任務';
$lang->project->treeOnlyStory = "樹狀圖只看{$lang->storyCommon}";
$lang->project->storyKanban = "{$lang->storyCommon}看板";
$lang->project->storySort = "{$lang->storyCommon}排序";
-$lang->project->importPlanStory = "創建" . $lang->projectCommon . "成功！\n是否導入計劃關聯的相關{$lang->storyCommon}？";
+$lang->project->importPlanStory = '創建' . $lang->projectCommon . '成功！\n是否導入計劃關聯的相關' . $lang->storyCommon . '？';
$lang->project->iteration = '版本迭代';
$lang->project->iterationInfo = '迭代%s次';
$lang->project->viewAll = '查看所有';
diff --git a/module/project/model.php b/module/project/model.php
index 4eab4e76d1..5de6d2bf8d 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -850,6 +850,7 @@ class projectModel extends model
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
+ if(empty($projects)) return array();
$projectKeys = array_keys($projects);
$stats = array();
@@ -1043,20 +1044,18 @@ class projectModel extends model
$delay = helper::diffDate(helper::today(), $project->end);
if($delay > 0) $project->delay = $delay;
}
-
+ /* Fix bug #2943. */
$total = $this->dao->select('
SUM(estimate) AS totalEstimate,
SUM(consumed) AS totalConsumed,
SUM(`left`) AS totalLeft')
->from(TABLE_TASK)
->where('project')->eq((int)$projectID)
- ->andWhere('status')->ne('cancel')
->andWhere('deleted')->eq(0)
->andWhere('parent')->lt(1)
->fetch();
$closedTotalLeft= (int)$this->dao->select('SUM(`left`) AS totalLeft')->from(TABLE_TASK)
->where('project')->eq((int)$projectID)
- ->andWhere('status')->eq('closed')
->andWhere('deleted')->eq(0)
->andWhere('parent')->lt(1)
->fetch('totalLeft');
@@ -1120,6 +1119,42 @@ class projectModel extends model
return $query->fetchAll('id');
}
+ /**
+ * Get ordered projects.
+ *
+ * @param string $status
+ * @param int $num
+ * @access public
+ * @return array
+ */
+ public function getOrderedProjects($status, $num = 0)
+ {
+ $projectList = $this->getList($status);
+ if(empty($projectList)) return $projectList;
+
+ $projects = $mineProjects = $otherProjects = $closedProjects = array();
+ foreach($projectList as $project)
+ {
+ if(!$this->app->user->admin and !$this->checkPriv($project->id)) continue;
+ if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account)
+ {
+ $mineProjects[$project->id] = $project;
+ }
+ elseif($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account))
+ {
+ $otherProjects[$project->id] = $project;
+ }
+ elseif($project->status == 'done' or $project->status == 'closed')
+ {
+ $closedProjects[$project->id] = $project;
+ }
+ }
+ $projects = $mineProjects + $otherProjects + $closedProjects;
+
+ if(empty($num)) return $projects;
+ return array_slice($projects, 0, $num, true);
+ }
+
/**
* Build story search form.
*
@@ -2663,7 +2698,7 @@ class projectModel extends model
foreach($dateList as $i => $date) $baselineJSON .= round(($days - $i) * $rate, 1) . ',';
$baselineJSON = rtrim($baselineJSON, ',') . ']';
- $chartData['labels'] = $this->report->convertFormat($dateList, 'j/n');
+ $chartData['labels'] = $this->report->convertFormat($dateList, 'n/j');
$chartData['burnLine'] = $this->report->createSingleJSON($sets, $dateList);
$chartData['baseLine'] = $baselineJSON;
@@ -2737,6 +2772,9 @@ class projectModel extends model
if(!isset($node->id))$node->id = 0;
if($node->type == 'story')
{
+ static $users;
+ if(empty($users)) $users = $this->loadModel('user')->getPairs('noletter');
+
$node->type = 'module';
$stories = isset($storyGroups[$node->root][$node->id]) ? $storyGroups[$node->root][$node->id] : array();
foreach($stories as $story)
@@ -2748,8 +2786,8 @@ class projectModel extends model
$storyItem->color = $story->color;
$storyItem->pri = $story->pri;
$storyItem->storyId = $story->id;
- $storyItem->openedBy = $story->openedBy;
- $storyItem->assignedTo = $story->assignedTo;
+ $storyItem->openedBy = $users[$story->openedBy];
+ $storyItem->assignedTo = zget($users, $story->assignedTo);
$storyItem->url = helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=project¶m=$projectID");
$storyItem->taskCreateUrl = helper::createLink('task', 'batchCreate', "projectID={$projectID}&story={$story->id}");
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 3e9fa7fdb9..c8d5a059fe 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -26,7 +26,7 @@
-
+
diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php
index 283b1d27a7..0331266986 100755
--- a/module/project/view/importbug.html.php
+++ b/module/project/view/importbug.html.php
@@ -24,7 +24,7 @@ var browseType = '';