- session->designList != false ? $app->session->designList : $this->createLink('design', 'browse', "productID=$design->product");?>
+ session->designList != false ? $app->session->designList : $this->createLink('design', 'browse', "projectID=$design->project");?>
' . $lang->goback, '', "class='btn btn-secondary'");?>
diff --git a/module/doc/control.php b/module/doc/control.php
index 3335e01e46..76ba88cd19 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -1125,7 +1125,7 @@ class doc extends control
/* Set Custom. */
foreach(explode(',', $this->config->doc->customObjectLibs) as $libType) $customObjectLibs[$libType] = $this->lang->doc->customObjectLibs[$libType];
- $actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID");
+ $actionURL = $this->createLink('doc', 'tableContents', "type=$type&objectID=$objectID&libID=$libID&browseType=bySearch¶m=myQueryID");
$this->doc->buildSearchForm(0, array(), 0, $actionURL, $type);
$moduleTree = $type == 'book' ? $this->doc->getBookStructure($libID) : $this->doc->getTreeMenu($type, $objectID, $libID, 0, $docID);
diff --git a/module/doc/model.php b/module/doc/model.php
index 4418f24105..eaa031b44b 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -60,18 +60,20 @@ class docModel extends model
* @param string $type
* @param string $extra
* @param string $appendLibs
- * @param int $projectID
+ * @param int $objectID
+ * @param string $excludeType
*
* @access public
* @return array
*/
- public function getLibs($type = '', $extra = '', $appendLibs = '', $objectID = 0)
+ public function getLibs($type = '', $extra = '', $appendLibs = '', $objectID = 0, $excludeType = '')
{
if($type == 'all' or $type == 'includeDeleted')
{
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
->where('type')->ne('api')
->beginIF($type == 'all')->andWhere('deleted')->eq(0)->fi()
+ ->beginIF($excludeType)->andWhere('type')->notin($excludeType)->fi()
->andWhere('vision')->eq($this->config->vision)
->orderBy('`order` asc, id_desc')
->query();
@@ -928,6 +930,13 @@ class docModel extends model
{
$this->loadModel('product');
+ /* Fixed search modal for doc view. */
+ if($this->app->getMethodName() == 'objectlibs')
+ {
+ $queryName = $type . 'Doc';
+ $type = 'objectLibs';
+ }
+
if($this->app->rawMethod == 'contribute')
{
$this->config->doc->search['module'] = 'contributeDoc';
@@ -951,6 +960,7 @@ class docModel extends model
}
else
{
+ $this->config->doc->search['module'] = $queryName;
$products = $this->product->getPairs('nocode', $this->session->project);
$this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs($this->session->project, 'all', 'noclosed') + array('all' => $this->lang->doc->allExecutions);
$this->config->doc->search['params']['lib']['values'] = array('' => '', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
diff --git a/module/doc/view/createtexttype.html.php b/module/doc/view/createtexttype.html.php
index af17839cb6..f74ded32e3 100644
--- a/module/doc/view/createtexttype.html.php
+++ b/module/doc/view/createtexttype.html.php
@@ -158,8 +158,7 @@
$(function()
{
var contentHeight = $(document).height() - 120;
- setTimeout(function(){$('.ke-edit-iframe, .ke-edit').height(contentHeight);}, 100);
- setTimeout(function(){$('.CodeMirror').height(contentHeight);}, 100);
+ setTimeout(function(){$('.ke-edit-iframe, .ke-edit, .ke-edit-textarea, .CodeMirror').height(contentHeight);}, 100);
$(document).on('click', '#modalBasicInfo tfoot .btn', function() {$('#modalBasicInfo').modal('hide');});
diff --git a/module/doc/view/edittexttype.html.php b/module/doc/view/edittexttype.html.php
index 137a001a85..f15cd256e0 100644
--- a/module/doc/view/edittexttype.html.php
+++ b/module/doc/view/edittexttype.html.php
@@ -155,8 +155,7 @@
$(function()
{
var contentHeight = $(document).height() - 100;
- setTimeout(function(){$('.ke-edit-iframe, .ke-edit').height(contentHeight);}, 100);
- setTimeout(function(){$('.CodeMirror').height(contentHeight);}, 100);
+ setTimeout(function(){$('.ke-edit-iframe, .ke-edit, .ke-edit-textarea, .CodeMirror').height(contentHeight);}, 100);
$(document).on('click', '#modalBasicInfo tfoot .btn', function() {$('#modalBasicInfo').modal('hide');});
diff --git a/module/execution/config.php b/module/execution/config.php
index 10694f9e4f..ae894c97ea 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -179,10 +179,14 @@ if(!isset($config->setCode) or $config->setCode == 1)
{
$config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
}
-else
+elseif($config->systemMode == 'new')
{
$config->execution->datatable->defaultField = array('id', 'name', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
}
+else
+{
+ $config->execution->datatable->defaultField = array('id', 'name', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
+}
$config->execution->datatable->fieldList['id']['title'] = 'idAB';
$config->execution->datatable->fieldList['id']['fixed'] = 'left';
@@ -202,10 +206,13 @@ if(!isset($config->setCode) or $config->setCode == 1)
$config->execution->datatable->fieldList['code']['required'] = 'no';
}
-$config->execution->datatable->fieldList['project']['title'] = 'project';
-$config->execution->datatable->fieldList['project']['fixed'] = 'no';
-$config->execution->datatable->fieldList['project']['width'] = '100';
-$config->execution->datatable->fieldList['project']['required'] = 'no';
+if($config->systemMode == 'new')
+{
+ $config->execution->datatable->fieldList['project']['title'] = 'project';
+ $config->execution->datatable->fieldList['project']['fixed'] = 'no';
+ $config->execution->datatable->fieldList['project']['width'] = '100';
+ $config->execution->datatable->fieldList['project']['required'] = 'no';
+}
$config->execution->datatable->fieldList['PM']['title'] = 'owner';
$config->execution->datatable->fieldList['PM']['fixed'] = 'no';
diff --git a/module/execution/control.php b/module/execution/control.php
index c8b7475689..dea8b3e57b 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -783,6 +783,7 @@ class execution extends control
/* Append id for secend sort. */
$sort = common::appendOrder($orderBy);
+ if(strpos($sort, 'pri_') !== false) $sort = str_replace('pri_', 'priOrder_', $sort);
$queryID = ($type == 'bysearch') ? $param : 0;
$execution = $this->commonAction($executionID);
@@ -3751,6 +3752,7 @@ class execution extends control
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
+ $this->view->projects = array('') + $this->project->getPairsByProgram();
$this->view->status = $status;
$this->view->from = $from;
$this->view->param = $param;
@@ -3996,7 +3998,7 @@ class execution extends control
{
foreach($planStory as $id => $story)
{
- if($story->status == 'draft')
+ if($story->status == 'draft' or $story->status == 'reviewing')
{
$count++;
unset($planStory[$id]);
diff --git a/module/execution/css/story.css b/module/execution/css/story.css
index 82615e05ac..5d0c443c1b 100644
--- a/module/execution/css/story.css
+++ b/module/execution/css/story.css
@@ -19,3 +19,4 @@ th.c-pri{width:50px;}
.panel-actions {position: relative; padding: 0;}
.switchBtn {background-color: #fff !important;}
.switchBtn > i {padding-left: 7px;}
+#main>.container {padding: 0 20px 20px 23px;}
diff --git a/module/execution/js/common.js b/module/execution/js/common.js
index 9d88292f43..70b25619db 100644
--- a/module/execution/js/common.js
+++ b/module/execution/js/common.js
@@ -141,9 +141,10 @@ function loadBranches(product)
if($inputgroup.find('.chosen-container').size() >= 2) $inputgroup.find('.chosen-container:last').remove();
var projectID = (typeof(systemMode) != 'undefined' && systemMode == 'new') ? $('#project').val() : 0;
+ if(typeof(projectID) == 'undefined') projectID = 0;
var index = $inputgroup.find('select:first').attr('id').replace('products' , '');
- $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=¶m=active&projectID=" + projectID + "&withMainBranch="), function(data)
+ $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=¶m=active&projectID=" + projectID + "&withMainBranch=true"), function(data)
{
if(data)
{
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index e5b9e41801..f56f57160a 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1130,7 +1130,7 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
if(data)
{
data = $.parseJSON(data);
- if(data.status == 'draft' || data.status == 'changed')
+ if(data.status == 'draft' || data.status == 'changing' || data.status == 'reviewing')
{
bootbox.alert(executionLang.storyDragError);
}
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index 5ad57d972c..dd817a899a 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -810,7 +810,7 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
if(data)
{
data = $.parseJSON(data);
- if(data.status == 'draft' || data.status == 'changed')
+ if(data.status == 'draft' || data.status == 'changing' || data.status == 'reviewing')
{
bootbox.alert(executionLang.storyDragError);
}
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 1cc9cb51bd..d7c4b8a112 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -411,7 +411,7 @@ $lang->execution->unresolvedBug = "[%s] unresolved bugs. ";
$lang->execution->projectNotEmpty = 'Project cannot be empty.';
$lang->execution->confirmStoryToTask = $lang->SRCommon . '%s are converted to tasks in the current. Do you want to convert them anyways?';
$lang->execution->ge = "『%s』should be >= actual begin『%s』.";
-$lang->execution->storyDragError = "The {$lang->SRCommon} is still a draft or has been changed, please drag it after the review";
+$lang->execution->storyDragError = "The {$lang->SRCommon} is not active. Please activate and drag again.";
$lang->execution->countTip = ' (%s member)';
$lang->execution->pleaseInput = "Enter";
$lang->execution->week = 'week';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 4c34595681..f9adc1fed0 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -411,7 +411,7 @@ $lang->execution->unresolvedBug = "[%s] unresolved bugs. ";
$lang->execution->projectNotEmpty = 'Project cannot be empty.';
$lang->execution->confirmStoryToTask = $lang->SRCommon . '%s are converted to tasks in the current. Do you want to convert them anyways?';
$lang->execution->ge = "『%s』should be >= actual begin『%s』.";
-$lang->execution->storyDragError = "The {$lang->SRCommon} is still a draft or has been changed, please drag it after the review";
+$lang->execution->storyDragError = "The {$lang->SRCommon} is not active. Please activate and drag again.";
$lang->execution->countTip = ' (%s member)';
$lang->execution->pleaseInput = "Enter";
$lang->execution->week = 'week';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 3e71a37d6b..bae0166bcd 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -411,7 +411,7 @@ $lang->execution->unresolvedBug = "[%s] unresolved bugs. ";
$lang->execution->projectNotEmpty = 'Project cannot be empty.';
$lang->execution->confirmStoryToTask = $lang->SRCommon . '%s are converted to tasks in the current. Do you want to convert them anyways?';
$lang->execution->ge = "『%s』should be >= actual begin『%s』.";
-$lang->execution->storyDragError = "The {$lang->SRCommon} is still a draft or has been changed, please drag it after the review";
+$lang->execution->storyDragError = "The {$lang->SRCommon} is not active. Please activate and drag again.";
$lang->execution->countTip = ' (%s member)';
$lang->execution->pleaseInput = "Enter";
$lang->execution->week = 'week';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 046e868a9d..9b308c85be 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -411,7 +411,7 @@ $lang->execution->unresolvedBug = "[%s]个未解决的bug，";
$lang->execution->projectNotEmpty = '所属项目不能为空。';
$lang->execution->confirmStoryToTask = '%s' . $lang->SRCommon . '已经在当前' . $lang->execution->common . '中转了任务，请确认是否重复转任务。';
$lang->execution->ge = "『%s』应当不小于实际开始时间『%s』。";
-$lang->execution->storyDragError = "该{$lang->SRCommon}还是草稿或已变更状态，请评审通过后再拖动";
+$lang->execution->storyDragError = "该{$lang->SRCommon}不是激活状态，请激活后再拖动";
$lang->execution->countTip = '（%s人）';
$lang->execution->pleaseInput = "请输入";
$lang->execution->week = '周';
diff --git a/module/execution/model.php b/module/execution/model.php
index c2f067fe39..591f8318fe 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -785,6 +785,18 @@ class executionModel extends model
return false;
}
+ /* Replace required language. */
+ if($this->app->tab == 'project')
+ {
+ $this->lang->project->name = $this->lang->execution->name;
+ $this->lang->project->code = $this->lang->execution->code;
+ }
+ else
+ {
+ $this->lang->project->name = $this->lang->execution->execName;
+ $this->lang->project->code = $this->lang->execution->execCode;
+ }
+
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck($skipFields = 'begin,end')
->batchcheck($this->config->execution->edit->requiredFields, 'notempty')
@@ -1303,12 +1315,16 @@ class executionModel extends model
* Get execution by idList.
*
* @param array $executionIdList
+ * @param string $mode all
* @access public
* @return array
*/
- public function getByIdList($executionIdList = array())
+ public function getByIdList($executionIdList = array(), $mode = '')
{
- return $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->andWhere('deleted')->eq(0)->fetchAll('id');
+ return $this->dao->select('*')->from(TABLE_EXECUTION)
+ ->where('id')->in($executionIdList)
+ ->beginIF($mode != 'all')->andWhere('deleted')->eq(0)->fi()
+ ->fetchAll('id');
}
/**
@@ -1561,10 +1577,11 @@ class executionModel extends model
* @param string $status
* @param int $limit
* @param string $pairs
+ * @param int $appenedID
* @access public
* @return array
*/
- public function getByProject($projectID, $status = 'all', $limit = 0, $pairs = false, $devel = false)
+ public function getByProject($projectID, $status = 'all', $limit = 0, $pairs = false, $devel = false, $appendedID = 0)
{
if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getExecutionPairs();
@@ -1581,6 +1598,7 @@ class executionModel extends model
->beginIF($status != 'all' and $status != 'undone' and $status != 'noclosed')->andWhere('status')->in($status)->fi()
->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
->beginIF($devel === true)->andWhere('attribute')->in('dev,qa,release')->fi()
+ ->beginIF($appendedID)->orWhere('id')->eq($appendedID)->fi()
->orderBy($orderBy)
->beginIF($limit)->limit($limit)->fi()
->fetchAll('id');
@@ -2688,7 +2706,7 @@ class executionModel extends model
parse_str($extra, $output);
foreach($stories as $key => $storyID)
{
- $notAllowedStatus = $this->app->rawMethod == 'batchcreate' ? 'closed' : 'draft,closed';
+ $notAllowedStatus = $this->app->rawMethod == 'batchcreate' ? 'closed' : 'draft,reviewing,closed';
if(strpos($notAllowedStatus, $storyList[$storyID]->status) !== false) continue;
if(isset($linkedStories[$storyID])) continue;
@@ -2783,7 +2801,7 @@ class executionModel extends model
{
foreach($planStory as $id => $story)
{
- if($story->status == 'draft')
+ if($story->status == 'draft' or $story->status == 'reviewing')
{
unset($planStory[$id]);
continue;
@@ -3636,7 +3654,8 @@ class executionModel extends model
->page($pager)
->fetchAll('id');
- $tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.product, t2.branch, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')
+ $orderBy = str_replace('pri_', 'priOrder_', $orderBy);
+ $tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.product, t2.branch, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName, IF(t1.`pri` = 0, 999, t1.`pri`) as priOrder')
->from(TABLE_TASK)->alias('t1')
->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index d38b3d3674..45f9ce52d7 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -229,7 +229,7 @@
$value)
{
- $this->story->printCell($value, $story, $users, $branchOption, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', '', $execution, $showBranch);
+ $this->story->printCell($value, $story, $users, $branchOption, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', 'story', $execution, $showBranch);
}
?>
diff --git a/module/file/control.php b/module/file/control.php
index 36e29ae62e..c8230031b6 100755
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -314,6 +314,7 @@ class file extends control
$this->view->files = $files;
$this->view->fieldset = $fieldset;
$this->view->object = $object;
+ $this->view->method = $method;
if($method == 'view') return $this->display('file', 'viewfiles');
$this->display();
diff --git a/module/file/lang/de.php b/module/file/lang/de.php
index d157e6e28d..9fce4814f3 100755
--- a/module/file/lang/de.php
+++ b/module/file/lang/de.php
@@ -70,3 +70,9 @@ $lang->file->errorSuffix = 'Format ist falsch. Nur .zip Dateien!';
$lang->file->errorExtract = 'Entpacken fehlgeschlagen. Die Datei ist vermutlich defekt.';
$lang->file->fileNotFound = 'The file was not found. The physical file might have been deleted!';
$lang->file->fileContentEmpty = 'The file is empty. Check the file and upload it again.';
+
+$lang->file->uploadError[1] = 'The uploaded filesize exceeds the limit. Please change the upload_max_filesize and post_max_size options in php.ini';
+$lang->file->uploadError[2] = 'The size of the uploaded file exceeds the value specified by the MAX_FILE_SIZE option in the HTML form';
+$lang->file->uploadError[3] = 'Only part of the file has been uploaded, please re-upload';
+$lang->file->uploadError[4] = 'No files have been uploaded';
+$lang->file->uploadError[5] = 'The size of the file is 0. Please upload the file again';
diff --git a/module/file/lang/en.php b/module/file/lang/en.php
index 78495f78de..ce9e2af939 100755
--- a/module/file/lang/en.php
+++ b/module/file/lang/en.php
@@ -70,3 +70,9 @@ $lang->file->errorSuffix = 'Format is incorrect. .zip files ONLY!';
$lang->file->errorExtract = 'Extracting files failed. Files might be damaged or there might be invalid files in the zip package.';
$lang->file->fileNotFound = 'The file was not found. The physical file might have been deleted!';
$lang->file->fileContentEmpty = 'The file is empty. Check the file and upload it again.';
+
+$lang->file->uploadError[1] = 'The uploaded filesize exceeds the limit. Please change the upload_max_filesize and post_max_size options in php.ini';
+$lang->file->uploadError[2] = 'The size of the uploaded file exceeds the value specified by the MAX_FILE_SIZE option in the HTML form';
+$lang->file->uploadError[3] = 'Only part of the file has been uploaded, please re-upload';
+$lang->file->uploadError[4] = 'No files have been uploaded';
+$lang->file->uploadError[5] = 'The size of the file is 0. Please upload the file again';
diff --git a/module/file/lang/fr.php b/module/file/lang/fr.php
index 6b29ba71f9..8740450ca8 100755
--- a/module/file/lang/fr.php
+++ b/module/file/lang/fr.php
@@ -70,3 +70,9 @@ $lang->file->errorSuffix = 'Format incorrect. Fichiers .zip SEULEMENT !';
$lang->file->errorExtract = "Echec de l'extraction des fichiers. Les fichiers peuvent être endommagé ou il y a un fichier invalide dans le zip.";
$lang->file->fileNotFound = 'Fichier non trouvé. Le fichier physique a peut-être été supprimé par innadvertance !';
$lang->file->fileContentEmpty = 'The file is empty. Check the file and upload it again.';
+
+$lang->file->uploadError[1] = 'The uploaded filesize exceeds the limit. Please change the upload_max_filesize and post_max_size options in php.ini';
+$lang->file->uploadError[2] = 'The size of the uploaded file exceeds the value specified by the MAX_FILE_SIZE option in the HTML form';
+$lang->file->uploadError[3] = 'Only part of the file has been uploaded, please re-upload';
+$lang->file->uploadError[4] = 'No files have been uploaded';
+$lang->file->uploadError[5] = 'The size of the file is 0. Please upload the file again';
diff --git a/module/file/lang/vi.php b/module/file/lang/vi.php
index 3a11441b1b..0c9b409d95 100755
--- a/module/file/lang/vi.php
+++ b/module/file/lang/vi.php
@@ -65,3 +65,9 @@ $lang->file->errorSuffix = 'Format is incorrect. .zip files ONLY!';
$lang->file->errorExtract = 'Extracting files failed. Files might be damaged or there might be invalid files in the zip package.';
$lang->file->fileNotFound = 'Tập tin was not found. The physical file might have been deleted!';
$lang->file->fileContentEmpty = 'The file is empty. Check the file and upload it again.';
+
+$lang->file->uploadError[1] = 'The uploaded filesize exceeds the limit. Please change the upload_max_filesize and post_max_size options in php.ini';
+$lang->file->uploadError[2] = 'The size of the uploaded file exceeds the value specified by the MAX_FILE_SIZE option in the HTML form';
+$lang->file->uploadError[3] = 'Only part of the file has been uploaded, please re-upload';
+$lang->file->uploadError[4] = 'No files have been uploaded';
+$lang->file->uploadError[5] = 'The size of the file is 0. Please upload the file again';
diff --git a/module/file/lang/zh-cn.php b/module/file/lang/zh-cn.php
index d44c794fd5..972cfc1a13 100755
--- a/module/file/lang/zh-cn.php
+++ b/module/file/lang/zh-cn.php
@@ -70,3 +70,9 @@ $lang->file->errorSuffix = '压缩包格式错误，只能上传zip压缩
$lang->file->errorExtract = '解压缩失败！可能文件已经损坏，或压缩包里含有非法上传文件。';
$lang->file->fileNotFound = '未找到该文件，可能物理文件已被删除！';
$lang->file->fileContentEmpty = '上传文件内容为空，请检查后重新上传。';
+
+$lang->file->uploadError[1] = "上传的文件大小超过了限制，请修改 php.ini 中 upload_max_filesize 与 post_max_size 选项限制的值";
+$lang->file->uploadError[2] = '上传文件的大小超过了 HTML 表单中 MAX_FILE_SIZE 选项指定的值';
+$lang->file->uploadError[3] = '文件只有部分被上传,请重新上传';
+$lang->file->uploadError[4] = '没有文件被上传';
+$lang->file->uploadError[5] = '上传文件大小为0,请重新上传';
diff --git a/module/file/model.php b/module/file/model.php
index aaf8813c45..72d4a1d828 100755
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -167,6 +167,8 @@ class fileModel extends model
$files = array();
if(!isset($_FILES[$htmlTagName])) return $files;
+ if(!is_array($_FILES[$htmlTagName]['error']) and $_FILES[$htmlTagName]['error'] != 0) return $_FILES[$htmlTagName];
+
$this->app->loadClass('purifier', true);
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);
diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php
index ee78a6ecc0..2c621c7413 100644
--- a/module/file/view/printfiles.html.php
+++ b/module/file/view/printfiles.html.php
@@ -92,7 +92,7 @@
if(common::hasPriv($objectType, 'edit', $object))
{
echo "
";
- common::printLink('file', 'edit', "fileID=$file->id", $lang->file->edit, '', "data-width='400' class='fileAction btn btn-link edit iframe text-primary' title='{$lang->file->edit}'");
+ if($method != 'storyChange') common::printLink('file', 'edit', "fileID=$file->id", $lang->file->edit, '', "data-width='400' class='fileAction btn btn-link edit iframe text-primary' title='{$lang->file->edit}'");
if(common::hasPriv('file', 'delete')) echo html::a('###', $lang->delete, '', "class='fileAction btn btn-link text-primary' onclick='deleteFile($file->id)' title='$lang->delete'");
echo '';
}
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index d26b0ac941..a0ff9f225b 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -491,15 +491,16 @@ $lang->resource->story = new stdclass();
$lang->resource->story->create = 'create';
$lang->resource->story->batchCreate = 'batchCreate';
$lang->resource->story->edit = 'editAction';
-$lang->resource->story->linkStory = 'linkStory';
+if($config->URAndSR) $lang->resource->story->linkStory = 'linkStory';
$lang->resource->story->batchEdit = 'batchEdit';
$lang->resource->story->export = 'exportAction';
$lang->resource->story->delete = 'deleteAction';
$lang->resource->story->view = 'view';
$lang->resource->story->change = 'changeAction';
$lang->resource->story->review = 'reviewAction';
+$lang->resource->story->submitReview = 'submitReview';
$lang->resource->story->batchReview = 'batchReview';
-$lang->resource->story->recall = 'recall';
+$lang->resource->story->recall = 'recallAction';
$lang->resource->story->assignTo = 'assignAction';
$lang->resource->story->close = 'closeAction';
$lang->resource->story->batchClose = 'batchClose';
@@ -525,6 +526,7 @@ $lang->story->methodOrder[25] = 'delete';
$lang->story->methodOrder[30] = 'view';
$lang->story->methodOrder[35] = 'change';
$lang->story->methodOrder[40] = 'review';
+$lang->story->methodOrder[44] = 'submitReview';
$lang->story->methodOrder[45] = 'batchReview';
$lang->story->methodOrder[50] = 'recall';
$lang->story->methodOrder[55] = 'close';
@@ -538,7 +540,7 @@ $lang->story->methodOrder[90] = 'tasks';
$lang->story->methodOrder[95] = 'bugs';
$lang->story->methodOrder[100] = 'cases';
$lang->story->methodOrder[105] = 'report';
-$lang->story->methodOrder[110] = 'linkStory';
+if($config->URAndSR) $lang->story->methodOrder[110] = 'linkStory';
$lang->story->methodOrder[115] = 'batchChangeBranch';
$lang->story->methodOrder[120] = 'batchChangeModule';
$lang->story->methodOrder[125] = 'batchToTask';
@@ -552,12 +554,14 @@ if($config->URAndSR)
$lang->resource->requirement->create = 'create';
$lang->resource->requirement->batchCreate = 'batchCreate';
$lang->resource->requirement->edit = 'editAction';
+ $lang->resource->requirement->linkStory = 'linkStory';
$lang->resource->requirement->batchEdit = 'batchEdit';
$lang->resource->requirement->export = 'exportAction';
$lang->resource->requirement->delete = 'deleteAction';
$lang->resource->requirement->view = 'view';
$lang->resource->requirement->change = 'changeAction';
$lang->resource->requirement->review = 'reviewAction';
+ $lang->resource->requirement->submitReview = 'submitReview';
$lang->resource->requirement->batchReview = 'batchReview';
$lang->resource->requirement->recall = 'recall';
$lang->resource->requirement->assignTo = 'assignAction';
@@ -570,25 +574,27 @@ if($config->URAndSR)
$lang->resource->requirement->batchChangeModule = 'batchChangeModule';
$lang->resource->requirement->linkRequirements = 'linkRequirementsAB';
- $lang->requirement->methodOrder[5] = 'create';
- $lang->requirement->methodOrder[10] = 'batchCreate';
- $lang->requirement->methodOrder[15] = 'edit';
- $lang->requirement->methodOrder[20] = 'export';
- $lang->requirement->methodOrder[25] = 'delete';
- $lang->requirement->methodOrder[30] = 'view';
- $lang->requirement->methodOrder[35] = 'change';
- $lang->requirement->methodOrder[40] = 'review';
- $lang->requirement->methodOrder[45] = 'batchReview';
- $lang->requirement->methodOrder[50] = 'recall';
- $lang->requirement->methodOrder[55] = 'close';
- $lang->requirement->methodOrder[60] = 'batchClose';
- $lang->requirement->methodOrder[65] = 'assignTo';
- $lang->requirement->methodOrder[70] = 'batchAssignTo';
- $lang->requirement->methodOrder[75] = 'activate';
- $lang->requirement->methodOrder[80] = 'report';
- $lang->requirement->methodOrder[85] = 'batchChangeBranch';
- $lang->requirement->methodOrder[90] = 'batchChangeModule';
- $lang->requirement->methodOrder[95] = 'linkRequirements';
+ $lang->requirement->methodOrder[5] = 'create';
+ $lang->requirement->methodOrder[10] = 'batchCreate';
+ $lang->requirement->methodOrder[15] = 'edit';
+ $lang->requirement->methodOrder[20] = 'export';
+ $lang->requirement->methodOrder[25] = 'delete';
+ $lang->requirement->methodOrder[30] = 'view';
+ $lang->requirement->methodOrder[35] = 'change';
+ $lang->requirement->methodOrder[40] = 'review';
+ $lang->requirement->methodOrder[44] = 'submitReview';
+ $lang->requirement->methodOrder[45] = 'batchReview';
+ $lang->requirement->methodOrder[50] = 'recall';
+ $lang->requirement->methodOrder[55] = 'close';
+ $lang->requirement->methodOrder[60] = 'batchClose';
+ $lang->requirement->methodOrder[65] = 'assignTo';
+ $lang->requirement->methodOrder[70] = 'batchAssignTo';
+ $lang->requirement->methodOrder[75] = 'activate';
+ $lang->requirement->methodOrder[80] = 'report';
+ $lang->requirement->methodOrder[85] = 'linkStory';
+ $lang->requirement->methodOrder[90] = 'batchChangeBranch';
+ $lang->requirement->methodOrder[95] = 'batchChangeModule';
+ $lang->requirement->methodOrder[100] = 'linkRequirements';
}
/* Product plan. */
diff --git a/module/kanban/model.php b/module/kanban/model.php
index a0e0f05747..50bca7f45d 100755
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -3868,7 +3868,7 @@ class kanbanModel extends model
{
$menu = array();
- $toTaskPriv = strpos('draft,closed', $story->status) !== false ? false : true;
+ $toTaskPriv = strpos('draft,reviewing,closed', $story->status) !== false ? false : true;
if(common::hasPriv('story', 'edit') and $this->story->isClickable($story, 'edit')) $menu[] = array('label' => $this->lang->story->edit, 'icon' => 'edit', 'url' => helper::createLink('story', 'edit', "storyID=$story->id", '', true), 'size' => '95%');
if(common::hasPriv('story', 'change') and $this->story->isClickable($story, 'change')) $menu[] = array('label' => $this->lang->story->change, 'icon' => 'alter', 'url' => helper::createLink('story', 'change', "storyID=$story->id", '', true), 'size' => '95%');
if(common::hasPriv('story', 'review') and $this->story->isClickable($story, 'review')) $menu[] = array('label' => $this->lang->story->review, 'icon' => 'search', 'url' => helper::createLink('story', 'review', "storyID=$story->id", '', true), 'size' => '95%');
diff --git a/module/message/model.php b/module/message/model.php
index b640916bc4..1dd601e02c 100755
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -155,10 +155,11 @@ class messageModel extends model
$moduleName = $objectType == 'case' ? 'testcase' : $objectType;
$moduleName = $objectType == 'kanbancard' ? 'kanban' : $objectType;
- $space = common::checkNotCN() ? ' ' : '';
- $data = $user->realname . $space . $this->lang->action->label->$actionType . $space . $this->lang->action->objectTypes[$objectType];
- $dataID = $objectType == 'kanbancard' ? $object->kanban : $objectID;
- $data .= ' ' . html::a($sysURL . helper::createLink($moduleName, 'view', "id=$dataID"), "[#{$objectID}::{$object->$field}]");
+ $space = common::checkNotCN() ? ' ' : '';
+ $data = $user->realname . $space . $this->lang->action->label->$actionType . $space . $this->lang->action->objectTypes[$objectType];
+ $dataID = $objectType == 'kanbancard' ? $object->kanban : $objectID;
+ $url = helper::createLink($moduleName, 'view', "id=$dataID");
+ $data .= ' ' . html::a((strpos($url, $sysURL) === 0 ? '' : $sysURL) . $url, "[#{$objectID}::{$object->$field}]");
if($isonlybody) $_GET['onlybody'] = 'yes';
diff --git a/module/mr/control.php b/module/mr/control.php
index 37fde7fcb8..310c1990fa 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -639,7 +639,7 @@ class mr extends control
}
else
{
- $allStories = $this->story->getProductStories($productID, 0, '0', 'draft,active,changed', 'story', 'id_desc', false, array_keys($linkedStories), $pager);
+ $allStories = $this->story->getProductStories($productID, 0, '0', 'draft,reviewing,active,changing', 'story', 'id_desc', false, array_keys($linkedStories), $pager);
}
$this->view->modules = $modules;
diff --git a/module/my/control.php b/module/my/control.php
index 967ff2e724..410145f572 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -332,15 +332,16 @@ EOF;
/* Append id for secend sort. */
$sort = common::appendOrder($orderBy);
+ if(strpos($sort, 'pri_') !== false) $sort = str_replace('pri_', 'priOrder_', $sort);
$queryID = ($type == 'bysearch') ? (int)$param : 0;
if($type == 'assignedBy')
{
- $stories = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'story');
+ $stories = $this->my->getAssignedByMe($this->app->user->account, '', $pager, $sort, 'story');
}
elseif($type == 'bysearch')
{
- $stories = $this->my->getStoriesBySearch($queryID, $this->app->rawMethod, $orderBy, $pager);
+ $stories = $this->my->getStoriesBySearch($queryID, $this->app->rawMethod, $sort, $pager);
}
else
{
@@ -396,15 +397,16 @@ EOF;
/* Append id for secend sort. */
$sort = common::appendOrder($orderBy);
+ if(strpos($sort, 'pri_') !== false) $sort = str_replace('pri_', 'priOrder_', $sort);
$queryID = ($type == 'bysearch') ? (int)$param : 0;
if($type == 'assignedBy')
{
- $stories = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'requirement');
+ $stories = $this->my->getAssignedByMe($this->app->user->account, '', $pager, $sort, 'requirement');
}
elseif($type == 'bysearch')
{
- $stories = $this->my->getRequirementsBySearch($queryID, $this->app->rawMethod, $orderBy, $pager);
+ $stories = $this->my->getRequirementsBySearch($queryID, $this->app->rawMethod, $sort, $pager);
}
else
{
@@ -569,9 +571,11 @@ EOF;
/* Append id for secend sort. */
$sort = common::appendOrder($orderBy);
+ if(strpos($sort, 'pri_') !== false) $sort = str_replace('pri_', 'priOrder_', $sort);
+ if(strpos($sort, 'severity_') !== false) $sort = str_replace('severity_', 'severityOrder_', $sort);
if($type == 'assignedBy')
{
- $bugs = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'bug');
+ $bugs = $this->my->getAssignedByMe($this->app->user->account, '', $pager, $sort, 'bug');
}
else
{
diff --git a/module/my/css/requirement.css b/module/my/css/requirement.css
index 13919b8117..c0389382d5 100644
--- a/module/my/css/requirement.css
+++ b/module/my/css/requirement.css
@@ -10,3 +10,4 @@
.table td.c-hours {padding-right: 12px;}
.main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
@-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};}
+.c-span {margin-left: 22px;}
diff --git a/module/my/css/testtask.css b/module/my/css/testtask.css
index 124ef6e446..4c9d612635 100644
--- a/module/my/css/testtask.css
+++ b/module/my/css/testtask.css
@@ -1 +1,4 @@
-.c-execution, .c-build {width: 120px;}
+.c-execution {width: 200px}
+.c-build {width: 120px;}
+.c-id {width: 60px;}
+.c-status {width: 80px;}
diff --git a/module/my/model.php b/module/my/model.php
index 80a9cf47ce..89101f568a 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -336,24 +336,27 @@ class myModel extends model
if($objectType == 'task')
{
- $objectList = $this->dao->select('t1.*, t2.name as executionName')->from($this->config->objectTables[$module])->alias('t1')
+ $orderBy = strpos($orderBy, 'pri_') !== false ? str_replace('pri_', 'priOrder_', $orderBy) : 't1.' . $orderBy;
+ $objectList = $this->dao->select("t1.*, t2.name as executionName, t2.type as executionType, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder")->from($this->config->objectTables[$module])->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on("t1.execution = t2.id")
->where('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->andWhere('t1.id')->in(array_keys($objectIDList))
- ->orderBy('t1.' . $orderBy)
+ ->orderBy($orderBy)
->page($pager)
->fetchAll('id');
}
elseif($objectType == 'requirement' or $objectType == 'story' or $objectType == 'bug')
{
- $objectList = $this->dao->select('t1.*')->from($this->config->objectTables[$module])->alias('t1')
+ $orderBy = (strpos($orderBy, 'priOrder') !== false or strpos($orderBy, 'severityOrder') !== false) ? $orderBy : "t1.$orderBy";
+ $select = strpos($orderBy, 'severity') !== false ? "t1.*,IF(t1.`severity` = 0, {$this->config->maxPriValue}, t1.`severity`) as severityOrder" : "t1.*,IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder";
+ $objectList = $this->dao->select($select)->from($this->config->objectTables[$module])->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on("t1.product = t2.id")
->where('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->andWhere('t1.id')->in(array_keys($objectIDList))
->beginIF($objectType == 'requirement' or $objectType == 'story')->andWhere('t1.type')->eq($objectType)->fi()
- ->orderBy('t1.' . $orderBy)
+ ->orderBy($orderBy)
->page($pager)
->fetchAll('id');
}
@@ -504,7 +507,6 @@ class myModel extends model
{
$rawMethod = $this->app->rawMethod;
$this->loadModel('execution');
- $this->app->loadConfig('execution');
$this->config->execution->search['module'] = $rawMethod . 'Task';
$this->config->execution->search['actionURL'] = $actionURL;
@@ -580,7 +582,8 @@ class myModel extends model
$query = preg_replace('/`(\w+)`/', 't1.`$1`', $query);
$query = str_replace('t1.`project`', 't2.`project`', $query);
- $tasks = $this->dao->select('t1.*, t2.id as executionID, t2.name as executionName, t2.type as executionType, t3.id as storyID, t3.title as storyTitle, t3.status AS storyStatus, t3.version AS latestStoryVersion')
+ $orderBy = str_replace('pri_', 'priOrder_', $orderBy);
+ $tasks = $this->dao->select("t1.*, t2.id as executionID, t2.name as executionName, t2.type as executionType, t3.id as storyID, t3.title as storyTitle, t3.status AS storyStatus, t3.version AS latestStoryVersion, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder")
->from(TABLE_TASK)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on("t1.execution = t2.id")
->leftJoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id')
@@ -827,7 +830,7 @@ class myModel extends model
$storyIDList[$storyID] = $storyID;
}
- $stories = $this->dao->select('distinct t1.*, t2.name as productTitle, t4.title as planTitle')->from(TABLE_STORY)->alias('t1')
+ $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t4.title as planTitle")->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
->leftJoin(TABLE_PLANSTORY)->alias('t3')->on('t1.id = t3.plan')
->leftJoin(TABLE_PRODUCTPLAN)->alias('t4')->on('t3.plan = t4.id')
@@ -846,7 +849,7 @@ class myModel extends model
}
else
{
- $stories = $this->dao->select('distinct t1.*, t2.name as productTitle, t4.title as planTitle')->from(TABLE_STORY)->alias('t1')
+ $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t4.title as planTitle")->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
->leftJoin(TABLE_PLANSTORY)->alias('t3')->on('t1.id = t3.plan')
->leftJoin(TABLE_PRODUCTPLAN)->alias('t4')->on('t3.plan = t4.id')
@@ -946,7 +949,7 @@ class myModel extends model
$requirementIDList[$requirementID] = $requirementID;
}
- $requirements = $this->dao->select('distinct t1.*, t2.name as productTitle')->from(TABLE_STORY)->alias('t1')
+ $requirements = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle")->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
->leftJoin(TABLE_STORYREVIEW)->alias('t3')->on('t1.id = t3.story')
->where($myRequirementQuery)
@@ -963,7 +966,7 @@ class myModel extends model
}
else
{
- $requirements = $this->dao->select('distinct t1.*, t2.name as productTitle')->from(TABLE_STORY)->alias('t1')
+ $requirements = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle")->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
->leftJoin(TABLE_STORYREVIEW)->alias('t3')->on('t1.id = t3.story')
->where($myRequirementQuery)
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index b26b4eec70..8472470c53 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -76,6 +76,7 @@
createLink('story', 'view', "id=$story->id");
$canBeChanged = common::canBeChanged('story', $story);
+ $spanClass = $canBatchAction ? 'c-span' : '';
?>
|
@@ -89,10 +90,10 @@
|
pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> |
- title, null, "style='color: $story->color' data-group='product'") : "$story->title";?>
+ title, null, "style='color: $story->color' data-group='product' title='$story->title'") : "$story->title";?>
children)) echo '';?>
|
- productTitle;?> |
+ productTitle;?> |
openedBy);?> |
estimate . $config->hourUnit;?> |
processStatus('story', $story);?> |
@@ -103,7 +104,15 @@
{
$vars = "story={$story->id}";
echo common::buildIconButton('story', 'change', "$vars&from=&storyType=requirement", $story, 'list', 'alter', '', 'iframe', true);
- echo common::buildIconButton('story', 'review', "$vars&from=product&storyType=requirement", $story, 'list', 'search', '', 'iframe', true);
+
+ if(strpos('draft,changing', $story->status) !== false)
+ {
+ echo common::buildIconButton('story', 'submitReview', "$vars&storyType=requirement", $story, 'list', 'sub-review', '', 'iframe', true);
+ }
+ else
+ {
+ echo common::buildIconButton('story', 'review', "$vars&from=product&storyType=requirement", $story, 'list', 'search', '', 'iframe', true);
+ }
echo common::buildIconButton('story', 'recall', "$vars&from=list&storyType=requirement", $story, 'list', 'undo', 'hiddenwin', '', '', '', $lang->story->recall);
echo common::buildIconButton('story', 'close', "$vars&from=&storyType=requirement", $story, 'list', '', '', 'iframe', true);
echo common::buildIconButton('story', 'edit', "$vars&from=default&storyType=requirement", $story, 'list', '', '', 'iframe', true, "data-width='95%'");
@@ -119,19 +128,14 @@
children)) ? ' table-child-bottom' : '';?>
|
-
-
-
-
-
-
+
id);?>
|
pri;?>' title='story->priList, $child->pri, $child->pri);?>'>story->priList, $child->pri, $child->pri);?> |
- lang->story->children .'">SR ' . (common::hasPriv('story', 'view') ? html::a($storyLink, $child->title, null, "style='color: $child->color' data-group='product'") : $child->title);?>
+ lang->story->children .'">SR ' . (common::hasPriv('story', 'view') ? html::a($storyLink, $child->title, null, "style='color: $child->color' data-group='product' title='$child->title'") : $child->title);?>
|
- productTitle;?> |
+ productTitle;?> |
openedBy);?> |
estimate . $config->hourUnit;?> |
URChanged ? "{$this->lang->story->URChanged}" : "" . $this->processStatus('story', $child) . ''?> |
@@ -147,11 +151,20 @@
}
else
{
- common::printIcon('story', 'change', $vars, $child, 'list', 'alter');
- common::printIcon('story', 'review', $vars, $child, 'list', 'search');
- common::printIcon('story', 'close', $vars, $child, 'list', '', '', 'iframe', true);
- common::printIcon('story', 'edit', $vars, $child, 'list');
- common::printIcon('story', 'createCase', "productID=$child->product&branch=$child->branch&module=0&from=¶m=0&$vars", $child, 'list', 'sitemap');
+ common::printIcon('story', 'change', "$vars&from=&storyType=story", $child, 'list', 'alter', '', 'iframe', true);
+
+ if(strpos('draft,changing', $child->status) !== false)
+ {
+ common::printIcon('story', 'submitReview', "$vars&storyType=story", $child, 'list', 'sub-review', '', 'iframe', true);
+ }
+ else
+ {
+ common::printIcon('story', 'review', "$vars&from=product&storyType=story", $child, 'list', 'search', '', 'iframe', true);
+ }
+
+ common::printIcon('story', 'recall', "$vars&from=list&storyType=story", $child, 'list', 'undo', 'hiddenwin', '', '', '', $lang->story->recall);
+ common::printIcon('story', 'close', "$vars&from=&storyType=story", $child, 'list', '', '', 'iframe', true);
+ common::printIcon('story', 'edit', "$vars&from=default&storyType=story", $child, 'list');
}
}
?>
@@ -185,7 +198,7 @@
unset($lang->story->reviewResultList['revert']);
foreach($lang->story->reviewResultList as $key => $result)
{
- $actionLink = $this->createLink('story', 'batchReview', "result=$key");
+ $actionLink = $this->createLink('story', 'batchReview', "result=$key&reason=&storyType=requirement");
if($key == 'reject')
{
echo "";
echo html::a('#', $reason, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
echo "";
@@ -218,7 +231,7 @@
10;
- $actionLink = $this->createLink('story', 'batchAssignTo');
+ $actionLink = $this->createLink('story', 'batchAssignTo', 'storyType=requirement');
echo html::select('assignedTo', $users, '', 'class="hidden"');
if($withSearch)
{
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 192f898a06..e19a82ece3 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -105,7 +105,16 @@
{
$vars = "story={$story->id}";
echo common::buildIconButton('story', 'change', $vars, $story, 'list', 'alter', '', 'iframe', true);
- echo common::buildIconButton('story', 'review', $vars, $story, 'list', 'search', '', 'iframe', true);
+
+ if(strpos('draft,changing', $story->status) !== false)
+ {
+ echo common::buildIconButton('story', 'submitReview', $vars, $story, 'list', 'sub-review', '', 'iframe', true);
+ }
+ else
+ {
+ echo common::buildIconButton('story', 'review', $vars, $story, 'list', 'search', '', 'iframe', true);
+ }
+
echo common::buildIconButton('story', 'recall', $vars, $story, 'list', 'undo', 'hiddenwin', '', '', '', $lang->story->recall);
echo common::buildIconButton('story', 'close', $vars, $story, 'list', '', '', 'iframe', true);
echo common::buildIconButton('story', 'edit', $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'");
@@ -145,8 +154,17 @@
if($canBeChanged)
{
$vars = "story={$child->id}";
- common::printIcon('story', 'change', $vars, $child, 'list', 'alter', '', 'iframe', true);
- common::printIcon('story', 'review', $vars, $child, 'list', 'search', '', 'iframe', true);
+ common::printIcon('story', 'change', $vars, $child, 'list', 'alter', '', 'iframe', true);
+
+ if(strpos('draft,changing', $child->status) !== false)
+ {
+ common::printIcon('story', 'submitReview', $vars, $child, 'list', 'sub-review', '', 'iframe', true);
+ }
+ else
+ {
+ common::printIcon('story', 'review', $vars, $child, 'list', 'search', '', 'iframe', true);
+ }
+ common::printIcon('story', 'recall', $vars, $child, 'list', 'undo', 'hiddenwin', '', '', '', $lang->story->recall);
common::printIcon('story', 'close', $vars, $child, 'list', '', '', 'iframe', true);
common::printIcon('story', 'edit', $vars, $child, 'list', '', '', 'iframe', true, "data-width='95%'");
common::printIcon('story', 'createCase', "productID=$child->product&branch=$child->branch&module=0&from=¶m=0&$vars", $child, 'list', 'sitemap', '', 'iframe', true, "data-width='95%'");
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 14af9270fd..69b47b7bfc 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -108,8 +108,9 @@
}
else
{
- $class = ($task->executionType == 'kanban') ? 'iframe' : '';
- echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color'");
+ $onlybody = $task->executionType == 'kanban' ? true : '';
+ $class = $task->executionType == 'kanban' ? 'iframe' : '';
+ echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color'");
}
?>
children)) echo '';?>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 4c7e9b1a19..9df1becf44 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -47,12 +47,12 @@
| id);?> |
- createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> |
- executionName?> |
- build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> |
+ createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> |
+ executionName;?> |
+ trunk : $task->buildName;?>'>build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> |
begin?> |
end?> |
- processStatus('testtask', $task);?> |
+ '>processStatus('testtask', $task);?> |
id", $task, 'list', 'sitemap', '', '', '', "data-app='qa'");
diff --git a/module/port/config.php b/module/port/config.php
index 2b6ead6da0..98b61d8877 100644
--- a/module/port/config.php
+++ b/module/port/config.php
@@ -17,7 +17,7 @@ $config->port->datetimeFeilds = '';
$config->port->listFields = '';
$config->port->sysLangFields = ',pri,status,type,mode,severity,os,browser,resolution,confirmed,source,reviewResult,stage,change,category';
$config->port->sysDataFields = 'execution,product,user';
-$config->port->userFields = 'assignedTo,openedBy,finishedBy,canceledBy,closedBy,lastEditedBy,lastRunner,resolvedBy,reviewedBy';
+$config->port->userFields = 'assignedTo,openedBy,finishedBy,canceledBy,closedBy,lastEditedBy,lastRunner,resolvedBy,reviewedBy,mailto';
$config->port->defaultZeroField = 'severity,pri';
$config->port->defaultEmptyField = '';
diff --git a/module/port/control.php b/module/port/control.php
index bc8edac653..39257735fb 100644
--- a/module/port/control.php
+++ b/module/port/control.php
@@ -102,6 +102,9 @@ class port extends control
if($_FILES)
{
$file = $this->loadModel('file')->getUpload('file');
+
+ if(!empty($file['error'])) return print(js::confirm($this->lang->file->uploadError[$file['error']]));
+
$file = $file[0];
$shortName = $this->file->getSaveName($file['pathname']);
diff --git a/module/port/model.php b/module/port/model.php
index 1112e36cba..f93951a470 100644
--- a/module/port/model.php
+++ b/module/port/model.php
@@ -269,6 +269,12 @@ class portModel extends model
$modelFieldList['values'] = $this->initValues($model, $field, $modelFieldList, $withKey);
$fieldList[$field] = $modelFieldList;
}
+
+ if(!empty($fieldList['mailto']))
+ {
+ $fieldList['mailto']['control'] = 'multiple';
+ $fieldList['mailto']['values'] = $this->portConfig->sysDataList['user'];
+ }
return $fieldList;
}
@@ -403,7 +409,11 @@ class portModel extends model
$sysDataFields = explode(',', $this->portConfig->sysDataFields);
- foreach($sysDataFields as $field) $dataList[$field] = $this->loadModel($field)->getPairs();
+ foreach($sysDataFields as $field)
+ {
+ $dataList[$field] = $this->loadModel($field)->getPairs();
+ if($field == 'user') $dataList[$field] = $this->loadModel($field)->getPairs('noclosed|nodeleted|noletter');
+ }
return $dataList;
}
@@ -479,7 +489,7 @@ class portModel extends model
{
$getParams = $this->session->{$model . 'PortParams'};
- if($params and $getParams)
+ if($params)
{
$params = explode('&', $params);
foreach($params as $param => $value)
@@ -560,9 +570,12 @@ class portModel extends model
{
if($fieldList[$field]['control'] == 'multiple')
{
- $multiple = '';
+ $multiple = '';
+ $separator = $field == 'mailto' ? ',' : "\n";
$multipleLsit = explode(',', $value);
- foreach($multipleLsit as $tmpValue) $multiple .= "\n" . zget($exportDatas[$field], $tmpValue);
+
+ foreach($multipleLsit as $key => $tmpValue) $multipleLsit[$key] = zget($exportDatas[$field], $tmpValue);
+ $multiple = join($separator, $multipleLsit);
$rows[$id]->$field = $multiple;
}
else
@@ -767,9 +780,12 @@ class portModel extends model
if(strpos($queryCondition, "`{$this->config->db->prefix}$model` AS t2") !== false) $selectKey = 't2.id';
$stmt = $this->dbh->query($queryCondition . ($this->post->exportType == 'selected' ? " AND $selectKey IN({$this->cookie->checkedItem})" : ''));
- while($row = $stmt->fetch()) $modelDatas[$row->id] = $row;
+ while($row = $stmt->fetch())
+ {
+ if($selectKey !== 't1.id' and isset($row->$model) and isset($row->id)) $row->id = $row->$model;
+ $modelDatas[$row->id] = $row;
+ }
}
-
return $modelDatas;
}
@@ -1273,7 +1289,7 @@ class portModel extends model
$control = $value['control'];
$values = $value['values'];
$name = "{$field}[$row]";
- $selected = !empty($object->$field) ? $object->$field : '';
+ $selected = isset($object->$field) ? $object->$field : '';
if($model)
{
if($control == 'hidden' and isset($this->session->{$model.'PortParams'}[$field. 'ID'])) $selected = $this->session->{$model . 'PortParams'}[$field. 'ID'];
diff --git a/module/product/config.php b/module/product/config.php
index c86e3890e7..bb08427abd 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -149,8 +149,8 @@ $config->product->report->planLabels = array();
$config->product->report->planLabels[] = '';
$config->product->statisticFields = array();
-$config->product->statisticFields['requirements'] = array('draftRequirements', 'activeRequirements', 'changedRequirements', 'closedRequirements');
-$config->product->statisticFields['stories'] = array('draftStories', 'activeStories', 'changedStories', 'closedStories');
+$config->product->statisticFields['requirements'] = array('draftRequirements', 'activeRequirements', 'changingRequirements', 'reviewingRequirements', 'closedRequirements');
+$config->product->statisticFields['stories'] = array('draftStories', 'activeStories', 'changingStories', 'reviewingStories', 'closedStories');
$config->product->statisticFields['bugs'] = array('unResolvedBugs', 'closedBugs', 'fixedBugs');
$config->product->statisticFields['plans'] = array('plans');
$config->product->statisticFields['releases'] = array('releases');
diff --git a/module/product/control.php b/module/product/control.php
index 8774ee920f..ee3d3e1427 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -223,6 +223,7 @@ class product extends control
/* Append id for secend sort. */
$sort = common::appendOrder($orderBy);
+ if(strpos($sort, 'pri_') !== false) $sort = str_replace('pri_', 'priOrder_', $sort);
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -443,7 +444,6 @@ class product extends control
/* Init vars. */
$product = $this->product->getById($productID);
- if($product->bind) $this->config->product->edit->requiredFields = 'name';
$unmodifiableProjects = array();
$canChangeProgram = true;
@@ -1450,27 +1450,27 @@ class product extends control
$productStats = $this->product->getStats('program_desc,line_desc,' . $orderBy, null, $status);
foreach($productStats as $i => $product)
{
- $product->line = zget($lines, $product->line, '');
+ $product->line = zget($lines, $product->line, '');
if($this->config->URAndSR)
{
$product->activeRequirements = (int) $product->requirements['active'];
- $product->changedRequirements = (int) $product->requirements['changed'];
+ $product->changedRequirements = (int) $product->requirements['changing'];
$product->draftRequirements = (int) $product->requirements['draft'];
$product->closedRequirements = (int) $product->requirements['closed'];
$product->totalRequirements = $product->activeRequirements + $product->changedRequirements + $product->draftRequirements + $product->closedRequirements;
$product->requireCompleteRate = ($product->totalRequirements == 0 ? 0 : round($product->closedRequirements / $product->totalRequirements, 3) * 100) . '%';
}
- $product->activeStories = (int)$product->stories['active'];
- $product->changedStories = (int)$product->stories['changed'];
- $product->draftStories = (int)$product->stories['draft'];
- $product->closedStories = (int)$product->stories['closed'];
- $product->totalStories = $product->activeStories + $product->changedStories + $product->draftStories + $product->closedStories;
- $product->storyCompleteRate = ($product->totalStories == 0 ? 0 : round($product->closedStories / $product->totalStories, 3) * 100) . '%';
- $product->unResolvedBugs = (int)$product->unResolved;
- $product->assignToNullBugs = (int)$product->assignToNull;
- $product->closedBugs = (int)$product->closedBugs;
- $product->bugFixedRate = (($product->unResolved + $product->fixedBugs) == 0 ? 0 : round($product->fixedBugs / ($product->unResolved + $product->fixedBugs), 3) * 100) . '%';
- $product->program = $product->programName;
+ $product->activeStories = (int)$product->stories['active'];
+ $product->changedStories = (int)$product->stories['changing'];
+ $product->draftStories = (int)$product->stories['draft'];
+ $product->closedStories = (int)$product->stories['closed'];
+ $product->totalStories = $product->activeStories + $product->changedStories + $product->draftStories + $product->closedStories;
+ $product->storyCompleteRate = ($product->totalStories == 0 ? 0 : round($product->closedStories / $product->totalStories, 3) * 100) . '%';
+ $product->unResolvedBugs = (int)$product->unResolved;
+ $product->assignToNullBugs = (int)$product->assignToNull;
+ $product->closedBugs = (int)$product->closedBugs;
+ $product->bugFixedRate = (($product->unResolved + $product->fixedBugs) == 0 ? 0 : round($product->fixedBugs / ($product->unResolved + $product->fixedBugs), 3) * 100) . '%';
+ $product->program = $product->programName;
/* get rowspan data */
if($lastProgram == '' or $product->program != $lastProgram)
diff --git a/module/product/css/browse.css b/module/product/css/browse.css
index 1c3707a691..c2a8328f56 100644
--- a/module/product/css/browse.css
+++ b/module/product/css/browse.css
@@ -39,3 +39,4 @@ a.removeModule:hover {color: red;}
#batchUnlinkStoryTip .table th:first-child {width: 460px;}
#mainMenu .dropdown-menu>li>a>.icon {top: 4px;}
#productStoryForm tbody tr td .label {max-width: 100px; text-overflow: unset;}
+.c-span {margin-left: 19px;}
diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index e6f048368b..a9adf7e665 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -134,21 +134,22 @@ $lang->product->createdDate = 'Created Date';
$lang->product->createdVersion = 'Created Version';
$lang->product->mailto = 'Mailto';
-$lang->product->searchStory = 'Suche';
-$lang->product->assignedToMe = 'Mir zuweisen';
-$lang->product->openedByMe = 'Von mir erstellt';
-$lang->product->reviewedByMe = 'Von mir geprüft';
-$lang->product->reviewByMe = 'ReviewByMe';
-$lang->product->closedByMe = 'Von mir geschlossen';
-$lang->product->draftStory = 'Entwurf';
-$lang->product->activeStory = 'Aktiviert';
-$lang->product->changedStory = 'Geändert';
-$lang->product->willClose = 'Zu schließen';
-$lang->product->closedStory = 'Geschlossen';
-$lang->product->unclosed = 'Offen';
-$lang->product->unplan = 'Warten';
-$lang->product->viewByUser = 'By User';
-$lang->product->assignedByMe = 'AssignedByMe';
+$lang->product->searchStory = 'Suche';
+$lang->product->assignedToMe = 'Mir zuweisen';
+$lang->product->openedByMe = 'Von mir erstellt';
+$lang->product->reviewedByMe = 'Von mir geprüft';
+$lang->product->reviewByMe = 'ReviewByMe';
+$lang->product->closedByMe = 'Von mir geschlossen';
+$lang->product->draftStory = 'Entwurf';
+$lang->product->activeStory = 'Aktiviert';
+$lang->product->changingStory = 'Ändern';
+$lang->product->reviewingStory = 'Wird geprüft';
+$lang->product->willClose = 'Zu schließen';
+$lang->product->closedStory = 'Geschlossen';
+$lang->product->unclosed = 'Offen';
+$lang->product->unplan = 'Warten';
+$lang->product->viewByUser = 'By User';
+$lang->product->assignedByMe = 'AssignedByMe';
/* Product Kanban. */
$lang->product->myProduct = 'Products Ownedbyme';
@@ -219,9 +220,10 @@ $lang->product->featureBar['all']['all'] = $lang->product->allProduct;
$lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
$lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed'];
-$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
-$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
-$lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
-$lang->product->moreSelects['willclose'] = $lang->product->willClose;
-$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
+$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
+$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
+$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
+$lang->product->moreSelects['changingstory'] = $lang->product->changingStory;
+$lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->moreSelects['willclose'] = $lang->product->willClose;
+$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 0de635095b..5f07eb8736 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -134,21 +134,22 @@ $lang->product->createdDate = 'createdDate';
$lang->product->createdVersion = 'Created Version';
$lang->product->mailto = 'Mailto';
-$lang->product->searchStory = 'Search';
-$lang->product->assignedToMe = 'AssignedToMe';
-$lang->product->openedByMe = 'CreatedByMe';
-$lang->product->reviewedByMe = 'ReviewedByMe';
-$lang->product->reviewByMe = 'ReviewByMe';
-$lang->product->closedByMe = 'ClosedByMe';
-$lang->product->draftStory = 'Draft';
-$lang->product->activeStory = 'Activated';
-$lang->product->changedStory = 'Changed';
-$lang->product->willClose = 'ToBeClosed';
-$lang->product->closedStory = 'Closed';
-$lang->product->unclosed = 'Open';
-$lang->product->unplan = 'Unplanned';
-$lang->product->viewByUser = 'By User';
-$lang->product->assignedByMe = 'AssignedByMe';
+$lang->product->searchStory = 'Search';
+$lang->product->assignedToMe = 'AssignedToMe';
+$lang->product->openedByMe = 'CreatedByMe';
+$lang->product->reviewedByMe = 'ReviewedByMe';
+$lang->product->reviewByMe = 'ReviewByMe';
+$lang->product->closedByMe = 'ClosedByMe';
+$lang->product->draftStory = 'Draft';
+$lang->product->activeStory = 'Activated';
+$lang->product->changingStory = 'Changing';
+$lang->product->reviewingStory = 'Reviewing';
+$lang->product->willClose = 'ToBeClosed';
+$lang->product->closedStory = 'Closed';
+$lang->product->unclosed = 'Open';
+$lang->product->unplan = 'Unplanned';
+$lang->product->viewByUser = 'By User';
+$lang->product->assignedByMe = 'AssignedByMe';
/* Product Kanban. */
$lang->product->myProduct = 'Products Ownedbyme';
@@ -219,9 +220,10 @@ $lang->product->featureBar['all']['all'] = $lang->product->allProduct;
$lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
$lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed'];
-$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
-$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
-$lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
-$lang->product->moreSelects['willclose'] = $lang->product->willClose;
-$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
+$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
+$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
+$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
+$lang->product->moreSelects['changingstory'] = $lang->product->changingStory;
+$lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->moreSelects['willclose'] = $lang->product->willClose;
+$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index 822e86edda..fc9b29549d 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -134,21 +134,22 @@ $lang->product->createdDate = 'Créé le';
$lang->product->createdVersion = 'Created Version';
$lang->product->mailto = 'Mailto';
-$lang->product->searchStory = 'Recherche';
-$lang->product->assignedToMe = 'Affectées à Moi';
-$lang->product->openedByMe = 'Créées par Moi';
-$lang->product->reviewedByMe = 'Validées par Moi';
-$lang->product->reviewByMe = 'ReviewByMe';
-$lang->product->closedByMe = 'Fermées par Moi';
-$lang->product->draftStory = 'A étudier';
-$lang->product->activeStory = 'Actives';
-$lang->product->changedStory = 'Changées';
-$lang->product->willClose = 'A Fermer';
-$lang->product->closedStory = 'Fermées';
-$lang->product->unclosed = 'Ouvertes';
-$lang->product->unplan = 'Non planifiées';
-$lang->product->viewByUser = 'Par Utilisateur';
-$lang->product->assignedByMe = 'AssignedByMe';
+$lang->product->searchStory = 'Recherche';
+$lang->product->assignedToMe = 'Affectées à Moi';
+$lang->product->openedByMe = 'Créées par Moi';
+$lang->product->reviewedByMe = 'Validées par Moi';
+$lang->product->reviewByMe = 'ReviewByMe';
+$lang->product->closedByMe = 'Fermées par Moi';
+$lang->product->draftStory = 'A étudier';
+$lang->product->activeStory = 'Actives';
+$lang->product->changingStory = 'Changement en cours';
+$lang->product->reviewingStory = 'Examen en cours';
+$lang->product->willClose = 'A Fermer';
+$lang->product->closedStory = 'Fermées';
+$lang->product->unclosed = 'Ouvertes';
+$lang->product->unplan = 'Non planifiées';
+$lang->product->viewByUser = 'Par Utilisateur';
+$lang->product->assignedByMe = 'AssignedByMe';
/* Product Kanban. */
$lang->product->myProduct = 'Products Ownedbyme';
@@ -219,9 +220,10 @@ $lang->product->featureBar['all']['all'] = $lang->product->allProduct;
$lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
$lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed'];
-$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
-$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
-$lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
-$lang->product->moreSelects['willclose'] = $lang->product->willClose;
-$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
+$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
+$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
+$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
+$lang->product->moreSelects['changingstory'] = $lang->product->changingStory;
+$lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->moreSelects['willclose'] = $lang->product->willClose;
+$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php
index 126ea41ec2..718c9a68a6 100644
--- a/module/product/lang/vi.php
+++ b/module/product/lang/vi.php
@@ -115,19 +115,20 @@ $lang->product->iterationView = 'Chi tiết';
$lang->product->createdBy = 'Người tạo';
$lang->product->createdDate = 'Ngày tạo';
-$lang->product->searchStory = 'Tìm kiếm';
-$lang->product->assignedToMe = 'Giao cho bạn';
-$lang->product->openedByMe = 'Tạo bởi bạn';
-$lang->product->reviewedByMe = 'Duyệt bởi bạn';
-$lang->product->closedByMe = 'Đóng bởi bạn';
-$lang->product->draftStory = 'Nháp';
-$lang->product->activeStory = 'Đã kích hoạt';
-$lang->product->changedStory = 'Đã thay đổi';
-$lang->product->willClose = 'Đã đóng';
-$lang->product->closedStory = 'Đã đóng';
-$lang->product->unclosed = 'Mở';
-$lang->product->unplan = 'Chưa kế hoạch';
-$lang->product->viewByUser = 'Theo người dùng';
+$lang->product->searchStory = 'Tìm kiếm';
+$lang->product->assignedToMe = 'Giao cho bạn';
+$lang->product->openedByMe = 'Tạo bởi bạn';
+$lang->product->reviewedByMe = 'Duyệt bởi bạn';
+$lang->product->closedByMe = 'Đóng bởi bạn';
+$lang->product->draftStory = 'Nháp';
+$lang->product->activeStory = 'Đã kích hoạt';
+$lang->product->changingStory = 'Biến';
+$lang->product->reviewingStory = 'Đang xem xét';
+$lang->product->willClose = 'Đã đóng';
+$lang->product->closedStory = 'Đã đóng';
+$lang->product->unclosed = 'Mở';
+$lang->product->unplan = 'Chưa kế hoạch';
+$lang->product->viewByUser = 'Theo người dùng';
$lang->product->allStory = 'Tất cả ';
$lang->product->allProduct = 'Tất cả';
@@ -177,8 +178,9 @@ $lang->product->featureBar['all']['all'] = $lang->product->allProduct;
$lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
$lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed'];
-$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
-$lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
-$lang->product->moreSelects['willclose'] = $lang->product->willClose;
-$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
+$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
+$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
+$lang->product->moreSelects['changingstory'] = $lang->product->changingStory;
+$lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->moreSelects['willclose'] = $lang->product->willClose;
+$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 65124c9a9d..e5c1184c44 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -134,21 +134,22 @@ $lang->product->createdDate = '创建日期';
$lang->product->createdVersion = '创建版本';
$lang->product->mailto = '抄送给';
-$lang->product->searchStory = '搜索';
-$lang->product->assignedToMe = '指给我';
-$lang->product->openedByMe = '我创建';
-$lang->product->reviewedByMe = '我评审';
-$lang->product->reviewByMe = '待我评审';
-$lang->product->closedByMe = '我关闭';
-$lang->product->draftStory = '草稿';
-$lang->product->activeStory = '激活';
-$lang->product->changedStory = '已变更';
-$lang->product->willClose = '待关闭';
-$lang->product->closedStory = '已关闭';
-$lang->product->unclosed = '未关闭';
-$lang->product->unplan = "未计划";
-$lang->product->viewByUser = '按用户查看';
-$lang->product->assignedByMe = '我指派';
+$lang->product->searchStory = '搜索';
+$lang->product->assignedToMe = '指给我';
+$lang->product->openedByMe = '我创建';
+$lang->product->reviewedByMe = '我评审';
+$lang->product->reviewByMe = '待我评审';
+$lang->product->closedByMe = '我关闭';
+$lang->product->draftStory = '草稿';
+$lang->product->activeStory = '激活';
+$lang->product->changingStory = '变更中';
+$lang->product->reviewingStory = '评审中';
+$lang->product->willClose = '待关闭';
+$lang->product->closedStory = '已关闭';
+$lang->product->unclosed = '未关闭';
+$lang->product->unplan = "未计划";
+$lang->product->viewByUser = '按用户查看';
+$lang->product->assignedByMe = '我指派';
/* Product Kanban. */
$lang->product->myProduct = '我负责的' . $lang->productCommon;
@@ -219,9 +220,10 @@ $lang->product->featureBar['all']['all'] = '所有' . $lang->productCommon;
$lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
$lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed'];
-$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
-$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
-$lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
-$lang->product->moreSelects['willclose'] = $lang->product->willClose;
-$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
+$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
+$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
+$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
+$lang->product->moreSelects['changingstory'] = $lang->product->changingStory;
+$lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->moreSelects['willclose'] = $lang->product->willClose;
+$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 1e7d868f2b..7b568db8e5 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -126,20 +126,20 @@ $lang->product->createdDate = '創建日期';
$lang->product->createdVersion = '創建版本';
$lang->product->mailto = '抄送給';
-$lang->product->searchStory = '搜索';
-$lang->product->assignedToMe = '指給我';
-$lang->product->openedByMe = '我創建';
-$lang->product->reviewedByMe = '我評審';
-$lang->product->reviewByMe = '待我評審';
-$lang->product->closedByMe = '我關閉';
-$lang->product->draftStory = '草稿';
-$lang->product->activeStory = '激活';
-$lang->product->changedStory = '已變更';
-$lang->product->willClose = '待關閉';
-$lang->product->closedStory = '已關閉';
-$lang->product->unclosed = '未關閉';
-$lang->product->unplan = "未計劃";
-$lang->product->viewByUser = '按用戶查看';
+$lang->product->searchStory = '搜索';
+$lang->product->assignedToMe = '指給我';
+$lang->product->openedByMe = '我創建';
+$lang->product->reviewedByMe = '我評審';
+$lang->product->reviewByMe = '待我評審';
+$lang->product->closedByMe = '我關閉';
+$lang->product->draftStory = '草稿';
+$lang->product->activeStory = '激活';
+$lang->product->changingStory = '變更中';
+$lang->product->willClose = '待關閉';
+$lang->product->closedStory = '已關閉';
+$lang->product->unclosed = '未關閉';
+$lang->product->unplan = "未計劃";
+$lang->product->viewByUser = '按用戶查看';
/* Product Kanban. */
$lang->product->myProduct = '我負責的' . $lang->productCommon;
@@ -210,8 +210,8 @@ $lang->product->featureBar['all']['all'] = '所有' . $lang->productCommon;
$lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
$lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed'];
-$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
-$lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
-$lang->product->moreSelects['willclose'] = $lang->product->willClose;
-$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
+$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
+$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
+$lang->product->moreSelects['changingstory'] = $lang->product->changingStory;
+$lang->product->moreSelects['willclose'] = $lang->product->willClose;
+$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
diff --git a/module/product/model.php b/module/product/model.php
index 3dbd62f65c..84d41ea26e 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -754,7 +754,6 @@ class productModel extends model
{
$productID = (int)$productID;
$oldProduct = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch();
- if($oldProduct->bind) $this->config->product->edit->requiredFields = 'name';
$product = fixer::input('post')
->add('id', $productID)
@@ -1019,7 +1018,8 @@ class productModel extends model
if($browseType == 'closedbyme') $stories = $this->story->getByClosedBy($productID, $branch, $modules, $this->app->user->account, $type, $sort, $pager);
if($browseType == 'draftstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'draft', $type, $sort, $pager);
if($browseType == 'activestory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'active', $type, $sort, $pager);
- if($browseType == 'changedstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'changed', $type, $sort, $pager);
+ if($browseType == 'changingstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'changing', $type, $sort, $pager);
+ if($browseType == 'reviewingstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'reviewing', $type, $sort, $pager);
if($browseType == 'willclose') $stories = $this->story->get2BeClosed($productID, $branch, $modules, $type, $sort, $pager);
if($browseType == 'closedstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'closed', $type, $sort, $pager);
if($browseType == 'assignedbyme') $stories = $this->story->getByAssignedBy($productID, $branch, $modules, $this->app->user->account, $type, $sort, $pager);
@@ -1077,7 +1077,7 @@ class productModel extends model
$modules = array();
$branchList = $this->loadModel('branch')->getPairs($productID, '', $projectID);
$branchModuleList = $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branchList));
- foreach($branchModuleList as $branchID => $branchModules) $modules[] = $branchModules;
+ foreach($branchModuleList as $branchID => $branchModules) $modules = array_merge($modules, $branchModules);
}
else
{
@@ -2421,6 +2421,8 @@ class productModel extends model
$this->lang->product->menu->settings['subMenu']->branch['link'] = str_replace('@branch@', $this->lang->product->branchName[$product->type], $branchLink);
$this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
}
+
+ if(strpos($extra, 'requirement') !== false) unset($this->lang->product->moreSelects['willclose']);
}
/**
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index d22acc3ac8..9e5ece751d 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -51,9 +51,9 @@
product->name);?>
config->URAndSR):?>
- | story->requirement;?> |
+ story->requirement;?> |
- story->story;?> |
+ story->story;?> |
bug->common;?> |
product->plan;?> |
product->release;?> |
@@ -68,11 +68,13 @@
story->draft;?> |
story->activate;?> |
story->change;?> |
+ story->statusList['reviewing'];?> |
story->completeRate;?> |
story->draft;?> |
story->activate;?> |
story->change;?> |
+ story->statusList['reviewing'];?> |
story->completeRate;?> |
bug->activate;?> |
close;?> |
@@ -113,12 +115,14 @@
config->URAndSR):?>
|
|
- |
+ |
+ |
% |
|
|
- |
+ |
+ |
% |
|
|
@@ -158,12 +162,14 @@
config->URAndSR):?>
|
|
- |
+ |
+ |
% |
|
|
- |
+ |
+ |
% |
|
|
@@ -179,8 +185,8 @@
$product):?>
stories['active'] + $product->stories['closed'] + $product->stories['draft'] + $product->stories['changed'];
- $totalRequirements = $product->requirements['active'] + $product->requirements['closed'] + $product->requirements['draft'] + $product->requirements['changed'];
+ $totalStories = $product->stories['active'] + $product->stories['closed'] + $product->stories['draft'] + $product->stories['changing'] + $product->stories['reviewing'];
+ $totalRequirements = $product->requirements['active'] + $product->requirements['closed'] + $product->requirements['draft'] + $product->requirements['changing'] + $product->requirements['reviewing'];
$trClass = '';
if($product->line)
@@ -217,12 +223,14 @@
config->URAndSR):?>
requirements['draft'];?> |
requirements['active'];?> |
- requirements['changed'];?> |
+ requirements['changing'];?> |
+ requirements['reviewing'];?> |
requirements['closed'] / $totalRequirements, 3) * 100;?>% |
stories['draft'];?> |
stories['active'];?> |
- stories['changed'];?> |
+ stories['changing'];?> |
+ stories['reviewing'];?> |
stories['closed'] / $totalStories, 3) * 100;?>% |
unResolved;?> |
closedBugs;?> |
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 6e21e3e6c8..f234bbdbfd 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -290,14 +290,14 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
$canBatchClose = (common::hasPriv($storyType, 'batchClose') and strtolower($browseType) != 'closedbyme' and strtolower($browseType) != 'closedstory');
$canBatchReview = ($canBeChanged and common::hasPriv($storyType, 'batchReview'));
$canBatchChangeStage = ($canBeChanged and common::hasPriv('story', 'batchChangeStage') and $storyType == 'story');
- $canBatchChangeBranch = ($canBeChanged and common::hasPriv($storyType, 'batchChangeBranch'));
+ $canBatchChangeBranch = ($canBeChanged and common::hasPriv($storyType, 'batchChangeBranch') and $this->session->currentProductType and $this->session->currentProductType != 'normal' and $productID);
$canBatchChangeModule = ($canBeChanged and common::hasPriv($storyType, 'batchChangeModule'));
$canBatchChangePlan = ($canBeChanged and common::hasPriv('story', 'batchChangePlan') and $storyType == 'story');
$canBatchAssignTo = ($canBeChanged and common::hasPriv($storyType, 'batchAssignTo'));
$canBatchUnlink = ($canBeChanged and $this->app->tab == 'project' and common::hasPriv('projectstory', 'batchUnlinkStory'));
$canBatchImportToLib = ($canBeChanged and $this->app->tab == 'project' and isset($this->config->maxVersion) and common::hasPriv('story', 'batchImportToLib'));
- $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlink or $canBatchImportToLib);
+ $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlink or $canBatchImportToLib or $canBatchChangeBranch);
?>
';?>
' id='storyList' data-fixed-left-width='' data-fixed-right-width=''>
@@ -388,8 +388,10 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
$disabled = $canBatchEdit ? '' : "disabled='disabled'";
$actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=$projectID&branch=$branch&storyType=$storyType");
?>
- edit, "data-form-action='$actionLink' $disabled");?>
+ edit, "data-form-action='$actionLink' $disabled");?>
+
+