@@ -93,7 +105,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
|
- account => '')) . sprintf('%03d', $user->id);?>
+ id => '')) . sprintf('%03d', $user->id);?>
id);?>
diff --git a/module/custom/control.php b/module/custom/control.php
index 2c94c5fc0b..b3c48cc761 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -562,7 +562,7 @@ class custom extends control
{
if($_POST)
{
- $this->loadModel('setting')->setItem("system.common.CRKanban@{$this->config->vision}", $this->post->kanban);
+ $this->loadModel('setting')->setItem("system.common.CRKanban", $this->post->kanban);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
}
diff --git a/module/doc/control.php b/module/doc/control.php
index 731414c293..80c7c0b55a 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -527,12 +527,6 @@ class doc extends control
if(!(defined('RUN_MODE') && RUN_MODE == 'api')) $this->locate($browseLink);
}
- if($doc->contentType == 'markdown')
- {
- $doc->content = commonModel::processMarkdown($doc->content);
- $doc->digest = commonModel::processMarkdown($doc->digest);
- }
-
/* Check priv when lib is product or project. */
$lib = $this->doc->getLibByID($doc->lib);
$type = $lib->type;
@@ -998,12 +992,6 @@ class doc extends control
$doc->keywords = str_replace("，", ',', $doc->keywords);
$doc->keywords = explode(',', $doc->keywords);
}
-
- if($doc->contentType == 'markdown')
- {
- $doc->content = commonModel::processMarkdown($doc->content);
- $doc->digest = commonModel::processMarkdown($doc->digest);
- }
}
if(isset($doc) and ($doc->type == 'text' || $doc->type == 'article'))
diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css
index 01c2431ed2..0215993c68 100644
--- a/module/doc/css/objectlibs.css
+++ b/module/doc/css/objectlibs.css
@@ -18,6 +18,8 @@
#content .title {max-width: 54%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
#content .detail-content {padding-left: 10px;}
#mainContent .scrollbar-hover {max-height: 2000px; overflow: scroll;}
+#content .editor-preview {background: #fff}
+#content .CodeMirror{border: none}
#sidebar {width: 275px;}
#sidebar>.cell {width: 100%;}
#sidebar>.sidebar-toggle {left: 3px; right: auto;}
diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
index d1ecb68883..b2c0fa95ba 100644
--- a/module/doc/view/content.html.php
+++ b/module/doc/view/content.html.php
@@ -100,6 +100,10 @@
echo "";
}
}
+ elseif($doc->contentType == 'markdown')
+ {
+ echo "";
+ }
else
{
echo $doc->content;
@@ -283,3 +287,18 @@
+contentType == 'markdown'):?>
+
+
+content);?>
+
+
diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index 49211f1ddb..94fb295ae9 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -4,7 +4,7 @@
.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:not(.plan-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-.table td.has-child > .plan-toggle {color: #838a9d; position: relative; top: 1px;}
+.table td.has-child > .plan-toggle {color: #838a9d; position: relative; top: 1px;overflow: initial !important;}
.table td.has-child > .plan-toggle:hover {color: #006af1; cursor: pointer;}
.table td.has-child > .plan-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);}
.table td.has-child > .plan-toggle > .icon:before {text-align: left;}
@@ -14,17 +14,19 @@
td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
td.flex span.label-badge {margin-left: 5px; min-width: 50px;}
+td.flex span.label-badge.label-light {min-width: 22px;}
td.flex span.project-type-label {margin-left: 5px; min-width: 36px;}
@-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}
-.c-status, .c-date, .c-percent, .c-attribute {width: 80px;}
+.c-status, .c-date, .c-percent, .c-attribute, .c-end, .c-begin {width: 80px;}
.c-estimate, .c-consumed, .c-left, .c-pm {width: 70px;}
-.c-progress, .c-burn {width: 60px;}
-.c-code, .c-percent, .c-realBegan, .c-end, .c-begin, .c-realEnd{width: 100px;}
-.c-action {text-align: center;}
+.c-progress {width: 40px;}
+.c-burn {width: 60px;}
+.c-code, .c-percent, .c-realBegan, .c-realEnd{width: 90px;}
.c-name > span {margin-right: 2px;}
td.flex span.project-type-label {min-width: 40px;}
.label-children {min-width:22px !important;}
.c-name > a, .table-children .text-left > a {padding-left: 5px;}
.has-child > span {margin-right: 5px;}
+.c-name > .text-ellipsis {text-overflow: clip}
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index b6c0a7e99a..aab7f85aee 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -51,6 +51,23 @@ function changeStatus(executionStatus)
}
}
+/**
+ * Hide all action.
+ *
+ * @access public
+ * @return void
+ */
+function hideAction()
+{
+ $('.actions').hide();
+ $('.action').hide();
+ $('.avatar').removeAttr('data-toggle');
+ $('.kanban-group-header').hide();
+ $(".title").attr("disabled", true).css("pointer-events", "none");
+ $(".avatar").attr("disabled", true).css("pointer-events", "none");
+ window.sortableDisabled = true;
+}
+
/**
* Display the kanban in full screen.
*
@@ -68,21 +85,8 @@ function fullScreen()
{
$('#kanbanContainer').addClass('fullscreen')
.on('scroll', tryUpdateKanbanAffix);
- $('.actions').hide();
- $('.action').hide();
- $('.avatar').removeAttr('data-toggle');
- $('#kanbanContainer a.iframe').each(function()
- {
- if($(this).hasClass('iframe'))
- {
- var href = $(this).attr('href');
- $(this).removeClass('iframe');
- $(this).attr('href', 'javascript:void(0)');
- $(this).attr('href-bak', href);
- }
- })
- $('.kanban-group-header').hide();
- $(".title").attr("disabled", true).css("pointer-events", "none");
+
+ hideAction();
$.cookie('isFullScreen', 1);
};
@@ -123,17 +127,10 @@ function exitFullScreen()
$('.actions').show();
$('.action').show();
$('.avatar').attr('data-toggle', 'modal');
- $('#kanbanContainer a').each(function()
- {
- var hrefBak = $(this).attr('href-bak');
- if(hrefBak)
- {
- $(this).addClass('iframe');
- $(this).attr('href', hrefBak);
- }
- })
$('.kanban-group-header').show();
$(".title").attr("disabled", false).css("pointer-events", "auto");
+ $(".avatar").attr("disabled", false).css("pointer-events", "auto");
+ window.sortableDisabled = false;
$.cookie('isFullScreen', 0);
}
@@ -519,6 +516,8 @@ function renderStoryItem(item, $item, col)
}
}
+ if($.cookie('isFullScreen') == 1) hideAction();
+
return $item.attr('data-type', 'story').addClass('kanban-item-story');
}
@@ -583,6 +582,8 @@ function renderBugItem(item, $item, col)
}
}
+ if($.cookie('isFullScreen') == 1) hideAction();
+
return $item.attr('data-type', 'bug').addClass('kanban-item-bug');
}
@@ -648,6 +649,8 @@ function renderTaskItem(item, $item, col)
$item.attr('data-type', 'task').addClass('kanban-item-task');
+ if($.cookie('isFullScreen') == 1) hideAction();
+
return $item;
}
@@ -1413,6 +1416,10 @@ $(function()
return $ele.parent().children('.kanban-lane');
}
},
+ before: function()
+ {
+ return !window.sortableDisabled;
+ },
start: function(e)
{
if(sortType == 'region')
@@ -1430,6 +1437,8 @@ $(function()
},
finish: function(e)
{
+ if(!e.changed) return;
+
var url = '';
var orders = [];
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index 4873fc94f7..7689c835de 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -132,6 +132,7 @@ function renderStoryItem(item, $item, col)
}
}
+ if($.cookie('isFullScreen') == 1) hideAllAction();
return $item.attr('data-type', 'story').addClass('kanban-item-story');
}
@@ -196,6 +197,7 @@ function renderBugItem(item, $item, col)
}
}
+ if($.cookie('isFullScreen') == 1) hideAllAction();
return $item.attr('data-type', 'bug').addClass('kanban-item-bug');
}
@@ -261,6 +263,7 @@ function renderTaskItem(item, $item, col)
$item.attr('data-type', 'task').addClass('kanban-item-task');
+ if($.cookie('isFullScreen') == 1) hideAllAction();
return $item;
}
@@ -389,6 +392,24 @@ function createKanban(kanbanID, data, options)
$kanban.kanban($.extend({data: data, calcColHeight: calcColHeight, displayCards: displayCards}, options));
}
+/**
+ * Hide all actions.
+ *
+ * @access public
+ * @return void
+ */
+function hideAllAction()
+{
+ $('.actions').hide();
+ $(".title, .avatar.iframe").attr("disabled", true).css("pointer-events", "none");
+}
+
+/**
+ * Display the kanban in full screen.
+ *
+ * @access public
+ * @return void
+ */
function fullScreen()
{
$('#kanbans .kanban-header').addClass('headerTop');
@@ -399,17 +420,7 @@ function fullScreen()
var afterEnterFullscreen = function()
{
$('#kanbanContainer').addClass('scrollbar-hover');
- $('.actions').hide();
- $('#kanbanContainer a.iframe').each(function()
- {
- if($(this).hasClass('iframe'))
- {
- var href = $(this).attr('href');
- $(this).removeClass('iframe');
- $(this).attr('href', 'javascript:void(0)');
- $(this).attr('href-bak', href);
- }
- })
+ hideAllAction();
$.cookie('isFullScreen', 1);
}
@@ -448,15 +459,7 @@ function exitFullScreen()
$('#kanbans .kanban-header').removeClass('headerTop');
$('#kanbanContainer').removeClass('scrollbar-hover');
$('.actions').show();
- $('#kanbanContainer a').each(function()
- {
- var hrefBak = $(this).attr('href-bak');
- if(hrefBak)
- {
- $(this).addClass('iframe');
- $(this).attr('href', hrefBak);
- }
- })
+ $(".title, .avatar.iframe").attr("disabled", false).css("pointer-events", "auto");
$.cookie('isFullScreen', 0);
}
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index f3f06a59e8..bfaa86024e 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -97,7 +97,7 @@
| execution->end);?> |
execution->realBegan);?> |
execution->realEnd);?> |
- actions;?> |
+ actions;?> |
execution->begin);?> |
execution->end);?> |
@@ -139,7 +139,7 @@
projectModel == 'kanban' ? html::a($this->createLink('execution', 'kanban', 'executionID=' . $execution->id), $executionName, '', "class='text-ellipsis'") : html::a($this->createLink('execution', 'task', 'execution=' . $execution->id), $executionName, '', "class='text-ellipsis'");
if($onlyChildStage) echo "{$lang->programplan->childrenAB} ";
- echo !empty($execution->children) ? $execution->name : $executionLink;
+ echo !empty($execution->children) ? "$execution->name" : $executionLink;
if(isset($execution->delay)) echo "{$lang->execution->delayed} ";
?>
children)):?>
@@ -169,7 +169,7 @@
end) ? '' : $execution->end;?> |
realBegan) ? '' : $execution->realBegan;?> |
realEnd) ? '' : $execution->realEnd;?> |
-
+ |
id}", $execution, 'list', '', '', 'iframe', true);
$class = !empty($execution->children) ? 'disabled' : '';
@@ -230,10 +230,10 @@
id);?>
|
-
+ |
programplan->children}'>{$lang->programplan->childrenAB}";
- echo html::a($this->createLink('execution', 'task', 'execution=' . $child->id), $child->name);
+ echo html::a($this->createLink('execution', 'task', 'execution=' . $child->id), $child->name, '', "class='text-ellipsis'");
if(isset($child->delay)) echo "{$lang->execution->delayed} ";
?>
|
diff --git a/module/execution/view/manageproducts.html.php b/module/execution/view/manageproducts.html.php
index bf15c0d789..fb462be2a4 100644
--- a/module/execution/view/manageproducts.html.php
+++ b/module/execution/view/manageproducts.html.php
@@ -24,12 +24,13 @@
execution->linkedProducts;?>
- grade == 2 ? "disabled='disabled'" : '';?>
+
$productName):?>
- grade < 2 and in_array($productID, $unmodifiableProducts) and in_array($branchID, $unmodifiableBranches)) and !empty($linkedStoryIDList[$productID][$branchID])) $attr = "disabled='disabled'";?>
- grade < 2 and (!(in_array($productID, $unmodifiableProducts) and in_array($branchID, $unmodifiableBranches)) or empty($linkedStoryIDList[$productID][$branchID]))) $attr = '';?>
+
+
+ grade == '2' and ($linkedProducts[$productID]->type == 'normal' or $branchID == 0)) $attr = "disabled='disabled'";?>
execution->notAllowRemoveProducts, $linkedStoryIDList[$productID][$branchID]) : $productName;?>
@@ -75,6 +76,31 @@
+ grade == 2):?>
+
+
execution->unlinkedProducts;?>
+
+ $productName):?>
+ type != 'normal'):?>
+
+
+
+
+
+
+
+
+
+
+
',
@@ -229,6 +240,7 @@ function renderLaneName($lane, lane, $kanban, columns, kanban)
'
'
].join('')).appendTo($lane);
}
+ if($.cookie('isFullScreen') == 1) hideAllAction();
}
/**
@@ -414,6 +426,7 @@ function renderKanbanItem(item, $item)
$title.css('color', '');
$title.children('.label-finish').hide();
}
+ if($.cookie('isFullScreen') == 1) hideAllAction();
}
/**
diff --git a/module/kanban/model.php b/module/kanban/model.php
index e2f3151aa1..5315075c14 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1595,9 +1595,6 @@ class kanbanModel extends model
if(!isset($groupByList[$item->$groupBy])) $groupByList[$item->$groupBy] = $item->$groupBy;
}
- if(in_array($groupBy, array('module', 'story', 'pri', 'severity'))) $objectPairs[0] = $this->lang->$browseType->$groupBy . ': ' . $this->lang->kanban->noGroup;
- if(in_array($groupBy, array('assignedTo', 'type', 'category', 'source'))) $objectPairs[''] = $this->lang->$browseType->$groupBy . ': ' . $this->lang->kanban->noGroup;
-
if(in_array($groupBy, array('module', 'story', 'assignedTo')))
{
if($groupBy == 'module')
@@ -1626,17 +1623,22 @@ class kanbanModel extends model
}
else
{
+ unset($this->lang->$browseType->{$groupBy . 'List'}[0]);
+ unset($this->lang->$browseType->{$groupBy . 'List'}['']);
$objectPairs += $this->lang->$browseType->{$groupBy . 'List'};
}
+ if(in_array($groupBy, array('module', 'story', 'pri', 'severity'))) $objectPairs[0] = $this->lang->$browseType->$groupBy . ': ' . $this->lang->kanban->noGroup;
+ if(in_array($groupBy, array('assignedTo', 'source'))) $objectPairs[] = $this->lang->$browseType->$groupBy . ': ' . $this->lang->kanban->noGroup;
+
$laneColor = 0;
$order = 1;
- foreach($objectPairs as $objectID => $objectName)
+ foreach($objectPairs as $objectType => $objectName)
{
- if(!isset($groupByList[$objectID]) and $objectID) continue;
+ if(!isset($groupByList[$objectType]) and $objectType and !in_array($objectType, array('feature', 'design'))) continue;
$lane = new stdclass();
- $lane->id = $groupBy . $objectID;
+ $lane->id = $groupBy . $objectType;
$lane->type = $browseType;
$lane->execution = $executionID;
$lane->name = $objectName;
@@ -1646,7 +1648,7 @@ class kanbanModel extends model
$order += 1;
$laneColor += 1;
if($laneColor == count($this->config->kanban->laneColorList)) $laneColor = 0;
- $lanes[$objectID] = $lane;
+ $lanes[$objectType] = $lane;
}
return $lanes;
@@ -2062,7 +2064,7 @@ class kanbanModel extends model
$this->dao->insert(TABLE_KANBAN)->data($kanban)
->autoCheck()
->batchCheck($this->config->kanban->create->requiredFields, 'notempty')
- ->check('name', 'unique')
+ ->check('name', 'unique', "space = {$kanban->space}")
->exec();
if(!dao::isError())
diff --git a/module/my/css/project.css b/module/my/css/project.css
index 9bdefcf15e..cae5e90bc8 100644
--- a/module/my/css/project.css
+++ b/module/my/css/project.css
@@ -2,7 +2,8 @@
#projectList .c-actions {overflow: visible;}
#projectTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
-.c-budget {width: 100px;}
+.c-date {width: 80px;}
+.c-budget {width: 80px;}
.label-warning, .label-info {width: 60px !important;}
.project-type-label.label-outline {width: 50px; min-width: 50px;}
.c-date {width: 120px;}
diff --git a/module/my/css/project.en.css b/module/my/css/project.en.css
new file mode 100644
index 0000000000..1948d1949e
--- /dev/null
+++ b/module/my/css/project.en.css
@@ -0,0 +1,2 @@
+.c-begin {width: 120px;}
+.c-end {width: 100px;}
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 5b57199850..0f6bbd5308 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -39,8 +39,8 @@
project->status);?> |
- project->begin);?> |
- project->end);?> |
+ project->begin);?> |
+ project->end);?> |
project->budget);?> |
project->PM);?> |
actions;?> |
diff --git a/module/program/model.php b/module/program/model.php
index e841646f3b..13bf06b7cf 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -135,33 +135,30 @@ class programModel extends model
* @access public
* @return array
*/
- public function getList($status = 'all', $orderBy = 'id_asc', $pager = NULL, $type = '', $topIdList = '')
+ public function getList($status = 'all', $orderBy = 'id_asc', $pager = NULL, $type = '', $topIdList = array())
{
+ $userViewIdList = trim($this->app->user->view->programs, ',') . ',' . trim($this->app->user->view->projects, ',');
+ $userViewIdList = array_filter(explode(',', $userViewIdList));
+
$objectIdList = array();
- if(!$this->app->user->admin)
+ if($this->app->rawMethod == 'browse')
{
- $objectIdList = trim($this->app->user->view->programs, ',') . ',' . trim($this->app->user->view->projects, ',');
- $objectIdList = array_filter(explode(',', $objectIdList));
- asort($objectIdList);
+ $pathList = $this->dao->select('id,path')->from(TABLE_PROJECT)
+ ->where('type')->in('program,project')
+ ->beginIF(!$this->app->user->admin)->andWhere('id')->in($userViewIdList)->fi()
+ ->andWhere('deleted')->eq(0)
+ ->orderBy('id_asc')
+ ->fetchPairs('id');
- if($this->app->rawMethod == 'browse')
+ foreach($pathList as $path)
{
- $pathList = $this->dao->select('id,path')->from(TABLE_PROJECT)
- ->where('id')->in($objectIdList)
- ->andWhere('deleted')->eq(0)
- ->fetchPairs('id');
-
- $objectIdList = array();
- foreach($pathList as $path)
+ if($type == 'child' and !empty($topIdList))
{
- if($type == 'child' and !empty($topIdList))
- {
- $topID = $this->getTopByPath($path);
- if(!in_array($topID, $topIdList)) continue;
- }
-
- foreach(explode(',', trim($path, ',')) as $pathID) $objectIdList[$pathID] = $pathID;
+ $topID = $this->getTopByPath($path);
+ if(!in_array($topID, $topIdList)) continue;
}
+
+ foreach(explode(',', trim($path, ',')) as $pathID) $objectIdList[$pathID] = $pathID;
}
}
@@ -171,8 +168,11 @@ class programModel extends model
->andWhere('vision')->eq($this->config->vision)
->beginIF($status != 'all')->andWhere('status')->eq($status)->fi()
->beginIF(!$this->cookie->showClosed)->andWhere('status')->ne('closed')->fi()
+ ->beginIF($this->app->rawMethod == 'browse')
->beginIF($type === 'top')->andWhere('parent')->eq(0)->fi()
- ->beginIF(!$this->app->user->admin)->andWhere('id')->in($objectIdList)->fi()
+ ->beginIF($type === 'child' or !$this->app->user->admin)->andWhere('id')->in($objectIdList)->fi()
+ ->fi()
+ ->beginIF(!$this->app->user->admin and $this->app->rawMethod != 'browse')->andWhere('id')->in($userViewIdList)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index d1a16a3a96..4864f75ac9 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -60,6 +60,8 @@ $lang->project->daysGreaterProject = 'Days cannot be greater than days of projec
$lang->project->errorHours = 'Hours/Day cannot be greater than『24』';
$lang->project->workdaysExceed = 'No more than『%s』working days';
$lang->project->teamMembersCount = ', there are %s team members.';
+$lang->project->budgetNumber = '『Budget』must be numbers.';
+$lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.';
/* Fields. */
$lang->project->common = 'Project';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 239bc43e71..23191cf732 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -60,6 +60,8 @@ $lang->project->daysGreaterProject = '可用工日不能大于项目的可用工
$lang->project->errorHours = '可用工时/天不能大于『24』';
$lang->project->workdaysExceed = '可用工作日不能超过『%s』天';
$lang->project->teamMembersCount = '，团队成员共%s人。';
+$lang->project->budgetNumber = '『预算』金额必须为数字。';
+$lang->project->budgetGe0 = '『预算』金额必须大于等于0。';
/* Fields. */
$lang->project->common = '项目';
diff --git a/module/project/model.php b/module/project/model.php
index 1eb820692e..b30f4ec843 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -99,13 +99,14 @@ class projectModel extends model
* @access public
* @return array
*/
+
public function getBudgetUnitList()
{
$budgetUnitList = array();
if($this->config->vision != 'lite')
{
foreach(explode(',', $this->config->project->unitList) as $unit) $budgetUnitList[$unit] = zget($this->lang->project->unitList, $unit, '');
- }
+ }
return $budgetUnitList;
}
@@ -1055,7 +1056,6 @@ class projectModel extends model
->setIF($this->post->delta == 999, 'end', LONG_TIME)
->setIF($this->post->delta == 999, 'days', 0)
->setIF($this->post->acl == 'open', 'whitelist', '')
- ->setIF($this->post->budget != 0, 'budget', round((float)$this->post->budget, 2))
->setIF(!isset($_POST['whitelist']), 'whitelist', '')
->setDefault('openedBy', $this->app->user->account)
->setDefault('openedDate', helper::now())
@@ -1116,6 +1116,24 @@ class projectModel extends model
return false;
}
+ if(!empty($project->budget))
+ {
+ if(!is_numeric($project->budget))
+ {
+ dao::$errors['budget'] = sprintf($this->lang->project->budgetNumber);
+ return false;
+ }
+ else if(is_numeric($project->budget) and ($project->budget < 0))
+ {
+ dao::$errors['budget'] = sprintf($this->lang->project->budgetGe0);
+ return false;
+ }
+ else
+ {
+ $project->budget = round((float)$this->post->budget, 2);
+ }
+ }
+
/* When select create new product, product name cannot be empty and duplicate. */
if(isset($_POST['newProduct']))
{
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index 388eb1345a..5f39246a35 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -109,6 +109,9 @@ class projectreleaseModel extends model
$oldRelease = $this->dao->select('*')->from(TABLE_RELEASE)->where('id')->eq($releaseID)->fetch();
$branch = $this->dao->select('branch')->from(TABLE_BUILD)->where('id')->eq((int)$this->post->build)->fetch('branch');
+ /* Check build if build is required. */
+ if(strpos($this->config->release->edit->requiredFields, 'build') !== false and $this->post->build == false) return dao::$errors['build'] = sprintf($this->lang->error->notempty, $this->lang->release->build);
+
$release = fixer::input('post')->stripTags($this->config->release->editor->edit['id'], $this->config->allowedTags)
->add('branch', (int)$branch)
->join('mailto', ',')
diff --git a/module/release/config.php b/module/release/config.php
index 7e52377cd7..e49f950c9e 100644
--- a/module/release/config.php
+++ b/module/release/config.php
@@ -3,7 +3,7 @@ $config->release = new stdclass();
$config->release->create = new stdclass();
$config->release->edit = new stdclass();
$config->release->create->requiredFields = 'name,date';
-$config->release->edit->requiredFields = 'name,date';
+$config->release->edit->requiredFields = 'name,build,date';
$config->release->editor = new stdclass();
$config->release->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
diff --git a/module/story/model.php b/module/story/model.php
index d41ffd6d07..fcc5d9abbc 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2996,13 +2996,30 @@ class storyModel extends model
*/
public function getPlanStories($planID, $status = 'all', $orderBy = 'id_desc', $pager = null)
{
- $stories = $this->dao->select('distinct t1.story, t1.plan, t1.order, t2.*')
- ->from(TABLE_PLANSTORY)->alias('t1')
- ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
- ->where('t1.plan')->eq($planID)
- ->beginIF($status and $status != 'all')->andWhere('t2.status')->in($status)->fi()
- ->andWhere('t2.deleted')->eq(0)
- ->orderBy($orderBy)->page($pager)->fetchAll('id');
+ if(strpos($orderBy, 'module') !== false)
+ {
+ $orderBy = (strpos($orderBy, 'module_asc') !== false) ? 't3.path asc' : 't3.path desc';
+ $stories = $this->dao->select('distinct t1.story, t1.plan, t1.order, t2.*')
+ ->from(TABLE_PLANSTORY)->alias('t1')
+ ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
+ ->leftJoin(TABLE_MODULE)->alias('t3')->on('t2.module = t3.id')
+ ->where('t1.plan')->eq($planID)
+ ->beginIF($status and $status != 'all')->andWhere('t2.status')->in($status)->fi()
+ ->andWhere('t2.deleted')->eq(0)
+ ->orderBy($orderBy)->page($pager)
+ ->fetchAll('id');
+ }
+ else
+ {
+ $stories = $this->dao->select('distinct t1.story, t1.plan, t1.order, t2.*')
+ ->from(TABLE_PLANSTORY)->alias('t1')
+ ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
+ ->where('t1.plan')->eq($planID)
+ ->beginIF($status and $status != 'all')->andWhere('t2.status')->in($status)->fi()
+ ->andWhere('t2.deleted')->eq(0)
+ ->orderBy($orderBy)->page($pager)
+ ->fetchAll('id');
+ }
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
@@ -3881,7 +3898,7 @@ class storyModel extends model
$menu .= "";
$menu .= $this->buildMenu('story', 'edit', $params, $story, $type);
- $menu .= $this->buildMenu('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&{$params}&executionID=0&bugID=0&planID=0&todoID=0&extra=&type=$story->type", $story, $type, 'copy', '', '', ' ', "data-width='1050'");
+ $menu .= $this->buildMenu('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&{$params}&executionID=0&bugID=0&planID=0&todoID=0&extra=&type=$story->type", $story, $type, 'copy', '', '', '', "data-width='1050'");
$menu .= $this->buildMenu('story', 'delete', $params, $story, 'button', 'trash', 'hiddenwin', 'showinonlybody', true);
}
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 51504e3f0a..ba07b6894d 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -396,15 +396,27 @@ class testcaseModel extends model
foreach($case as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $case->$key = '';
/* Get project and execution. */
- $objects = $this->dao->select('t1.*, t1.project as objectID, t2.type')->from(TABLE_PROJECTCASE)->alias('t1')
- ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
- ->where('t1.case')->eq($caseID)
- ->fetchAll('objectID');
-
- foreach($objects as $objectID => $object)
+ if($this->app->tab == 'project')
{
- if($object->type == 'project') $case->project = $objectID;
- if(in_array($object->type, array('sprint', 'stage'))) $case->execution = $objectID;
+ $case->project = $this->session->project;
+ }
+ elseif($this->app->tab == 'execution')
+ {
+ $case->execution = $this->session->execution;
+ $case->project = $this->dao->select('project')->from(TABLE_PROJECT)->where('id')->eq($case->execution)->fetch('project');
+ }
+ else
+ {
+ $objects = $this->dao->select('t1.*, t1.project as objectID, t2.type')->from(TABLE_PROJECTCASE)->alias('t1')
+ ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
+ ->where('t1.case')->eq($caseID)
+ ->fetchAll('objectID');
+
+ foreach($objects as $objectID => $object)
+ {
+ if($object->type == 'project') $case->project = $objectID;
+ if(in_array($object->type, array('sprint', 'stage', 'kanban'))) $case->execution = $objectID;
+ }
}
if($case->story)
@@ -422,9 +434,16 @@ class testcaseModel extends model
if($case->linkCase or $case->fromCaseID) $case->linkCaseTitles = $this->dao->select('id,title')->from(TABLE_CASE)->where('id')->in($case->linkCase)->orWhere('id')->eq($case->fromCaseID)->fetchPairs();
if($version == 0) $version = $case->version;
- $case->steps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->eq($caseID)->andWhere('version')->eq($version)->orderBy('id')->fetchAll('id');
$case->files = $this->loadModel('file')->getByObject('testcase', $caseID);
$case->currentVersion = $version ? $version : $case->version;
+
+ $case->steps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->eq($caseID)->andWhere('version')->eq($version)->orderBy('id')->fetchAll('id');
+ foreach($case->steps as $key => $step)
+ {
+ $step->desc = html_entity_decode($step->desc);
+ $step->expect = html_entity_decode($step->expect);
+ }
+
return $case;
}
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 8d29af46bc..cd10ad9833 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -752,6 +752,12 @@ class testtask extends control
$this->loadModel('qa')->setMenu($this->products, $productID, $task->branch, $taskID);
}
+ if(!isset($this->products[$productID]))
+ {
+ $product = $this->product->getByID($productID);
+ $this->products[$productID] = $product->name;
+ }
+
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->edit;
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->testtask->common;
@@ -762,11 +768,15 @@ class testtask extends control
$projectID = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->project;
$executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
$executionID = $task->execution;
- $builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'noempty,notrunk', $executionID, 'execution');
+ if(!isset($executions[$executionID]))
+ {
+ $appendExecution = $this->loadModel('execution')->getByID($executionID);
+ $executions[$executionID] = $appendExecution->name;
+ }
$this->view->task = $task;
$this->view->executions = $executions;
- $this->view->builds = $builds;
+ $this->view->builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'noempty,notrunk', $executionID, 'execution');
$this->view->testreports = $this->loadModel('testreport')->getPairs($task->product, $task->testreport);
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed', $task->owner);
$this->view->contactLists = $this->user->getContactLists($this->app->user->account, 'withnote');
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 6946e7f513..9c8720028c 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1360,6 +1360,8 @@ class testtaskModel extends model
foreach($relatedStep as $stepID => $step)
{
$relatedStep[$stepID] = (array)$step;
+ $relatedStep[$stepID]['desc'] = html_entity_decode($relatedStep[$stepID]['desc']);
+ $relatedStep[$stepID]['expect'] = html_entity_decode($relatedStep[$stepID]['expect']);
if(isset($result->stepResults[$stepID]))
{
$relatedStep[$stepID]['result'] = $result->stepResults[$stepID]['result'];
diff --git a/module/user/control.php b/module/user/control.php
old mode 100644
new mode 100755
index 8ee813f090..a7fcae9a2c
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -658,7 +658,7 @@ class user extends control
{
if(isset($_POST['users']))
{
- $this->view->users = $this->dao->select('*')->from(TABLE_USER)->where('account')->in($this->post->users)->orderBy('id')->fetchAll('id');
+ $this->view->users = $this->dao->select('*')->from(TABLE_USER)->where('id')->in($this->post->users)->orderBy('id')->fetchAll('id');
}
elseif($_POST)
{
diff --git a/test/class/group.class.php b/test/class/group.class.php
index 2f64bae404..82633270ec 100755
--- a/test/class/group.class.php
+++ b/test/class/group.class.php
@@ -56,13 +56,20 @@ class groupTest
* @access public
* @return void
*/
- public function copyTest($groupID)
+ public function copyTest($groupID, $param)
{
+ foreach($param as $k => $v) $_POST[$k] = $v;
+
$objects = $this->objectModel->copy($groupID);
+ unset($_POST);
if(dao::isError()) return dao::getError();
- return $objects;
+ $newGroupID = $this->objectModel->dao->lastInsertID();
+ $object = $this->objectModel->getByID($newGroupID);
+
+ $this->objectModel->delete($newGroupID);
+ return $object;
}
/**
@@ -79,7 +86,22 @@ class groupTest
if(dao::isError()) return dao::getError();
- return $objects;
+ $fromPrivs = $this->objectModel->getPrivs($fromGroup);
+ $toPrivs = $this->objectModel->getPrivs($toGroup);
+
+ $result = true;
+ foreach($fromPrivs as $group => $privs)
+ {
+ foreach($privs as $key => $priv)
+ {
+ if(!isset($toPrivs[$group][$key]) or $toPrivs[$group][$key] != $fromPrivs[$group][$key])
+ {
+ $result = false;
+ break;
+ }
+ }
+ }
+ return $result;
}
/**
@@ -96,7 +118,19 @@ class groupTest
if(dao::isError()) return dao::getError();
- return $objects;
+ $fromUsers = $this->objectModel->getUserPairs($fromGroup);
+ $toUsers = $this->objectModel->getUserPairs($toGroup);
+
+ $result = true;
+ foreach($fromUsers as $account => $name)
+ {
+ if(!isset($toUsers[$account]) or $toUsers[$account] != $fromUsers[$account])
+ {
+ $result = false;
+ break;
+ }
+ }
+ return $result;
}
/**
@@ -268,11 +302,11 @@ class groupTest
*/
public function deleteTest($groupID, $null = null)
{
- $objects = $this->objectModel->delete($groupID, $null = null);
+ $this->objectModel->delete($groupID, $null = null);
if(dao::isError()) return dao::getError();
- return $objects;
+ return true;
}
/**
diff --git a/test/data/execution.yaml b/test/data/execution.yaml
index 977d864988..c01c1e03cb 100644
--- a/test/data/execution.yaml
+++ b/test/data/execution.yaml
@@ -30,6 +30,16 @@ fields:
- field: desc
range: 1-10000
prefix: "迭代描述"
+ - field: begin
+ range: "(-2M)-(+M):1D"
+ type: timestamp
+ format: "YY/MM/DD"
+ postfix: "\t"
+ - field: end
+ range: "(+1w)-(+2M):1D"
+ type: timestamp
+ format: "YY/MM/DD"
+ postfix: "\t"
- field: grade
range: 1
- field: parent
diff --git a/test/data/program.yaml b/test/data/program.yaml
index 354ef3f815..f609a8e0e1 100644
--- a/test/data/program.yaml
+++ b/test/data/program.yaml
@@ -39,6 +39,16 @@ fields:
- field: code
range: 1-10000
prefix: "program"
+ - field: begin
+ range: "(-5M)-(+M):1D"
+ type: timestamp
+ format: "YY/MM/DD"
+ postfix: "\t"
+ - field: end
+ range: "(+10w)-(+2M):1D"
+ type: timestamp
+ format: "YY/MM/DD"
+ postfix: "\t"
- field: desc
range: 1-10000
prefix: "项目集描述"
diff --git a/test/data/project.yaml b/test/data/project.yaml
index 1bfd668804..2c9bc17a08 100644
--- a/test/data/project.yaml
+++ b/test/data/project.yaml
@@ -56,12 +56,12 @@ fields:
range: 1-10000
prefix: "project"
- field: begin
- range: "(-2M)-(+M):1D"
+ range: "(-3M)-(+M):1D"
type: timestamp
format: "YY/MM/DD"
postfix: "\t"
- field: end
- range: "(+1w)-(+2M):1D"
+ range: "(+5w)-(+2M):1D"
type: timestamp
format: "YY/MM/DD"
postfix: "\t"
diff --git a/test/data/projectalone.yaml b/test/data/projectalone.yaml
index b54b939468..840af33daa 100644
--- a/test/data/projectalone.yaml
+++ b/test/data/projectalone.yaml
@@ -42,9 +42,16 @@ fields:
- field: parent
range: 0
- field: path
- range: 731-750
- prefix: ","
- postfix: ","
+ fields:
+ - field: path1
+ prefix: ","
+ range: 731-750
+ - field: path2
+ range: []
+ postfix: ","
+ - field: path3
+ range: []
+ postfix: ","
- field: grade
range: "1"
- field: code
diff --git a/test/data/zentao/config.php b/test/data/zentao/config.php
index d5e1252bb6..e316abb3c0 100644
--- a/test/data/zentao/config.php
+++ b/test/data/zentao/config.php
@@ -18,8 +18,8 @@ $builder->extension = array('rows' => 10, 'extends' => array('extension'));
$builder->program = array('rows' => 10, 'extends' => array('project', 'program'));
$builder->project = array('rows' => 90, 'extends' => array('project', 'project'));
-$builder->projectalone = array('rows' => 20, 'extends' => array('project', 'projectalone'));
$builder->sprint = array('rows' => 600, 'extends' => array('project', 'execution'));
+$builder->projectalone = array('rows' => 20, 'extends' => array('project', 'projectalone'));
$builder->story = array('rows' => 400, 'extends' => array('story'));
$builder->childstory = array('rows' => 50, 'extends' => array('story','childstory'));
diff --git a/test/model/group/copy.php b/test/model/group/copy.php
index 804d3dd221..756998f97a 100644
--- a/test/model/group/copy.php
+++ b/test/model/group/copy.php
@@ -10,8 +10,16 @@ title=测试 groupModel->copy();
cid=1
pid=1
+复制id为2的分组 >> 这是一个复制的分组
+复制名字已存在的分组 >> 『分组名称』已经有『我是一个分组』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。
+
*/
-$group = new groupTest();
+$groupID = 2;
-r($group->copyTest()) && p() && e();
\ No newline at end of file
+$data = array('name' => '这是一个复制的分组');
+$existData = array('name' => '我是一个分组');
+
+$group = new groupTest();
+r($group->copyTest($groupID, $data)) && p('name') && e('这是一个复制的分组'); // 这是一个复制的分组
+r($group->copyTest($groupID, $existData)) && p('name:0') && e('『分组名称』已经有『我是一个分组』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。'); // 『分组名称』已经有『我是一个分组』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。
diff --git a/test/model/group/copypriv.php b/test/model/group/copypriv.php
index df9a1ea721..d98fb151ba 100644
--- a/test/model/group/copypriv.php
+++ b/test/model/group/copypriv.php
@@ -10,8 +10,12 @@ title=测试 groupModel->copyPriv();
cid=1
pid=1
+复制分组6权限到分组7 >> 1
+
*/
-$group = new groupTest();
+$fromGroup = 6;
+$toGroup = 7;
-r($group->copyPrivTest()) && p() && e();
\ No newline at end of file
+$group = new groupTest();
+r($group->copyPrivTest($fromGroup, $toGroup)) && p() && e('1'); // 复制分组6权限到分组7
diff --git a/test/model/group/copyuser.php b/test/model/group/copyuser.php
index 471519d875..8e5e8171b3 100644
--- a/test/model/group/copyuser.php
+++ b/test/model/group/copyuser.php
@@ -10,8 +10,14 @@ title=测试 groupModel->copyUser();
cid=1
pid=1
+复制分组6用户到分组7 >> 1
+
*/
+$fromGroup = 6;
+$toGroup = 7;
+
$group = new groupTest();
-r($group->copyUserTest()) && p() && e();
\ No newline at end of file
+r($group->copyUserTest($fromGroup, $toGroup)) && p() && e('1'); // 复制分组6用户到分组7
+system("./ztest init");
diff --git a/test/model/group/delete.php b/test/model/group/delete.php
index 9ea473d918..2e14d9c5fd 100644
--- a/test/model/group/delete.php
+++ b/test/model/group/delete.php
@@ -10,8 +10,14 @@ title=测试 groupModel->delete();
cid=1
pid=1
+删除id为10的组 >> 1
+删除id为0的组 >> 1
+
*/
-$group = new groupTest();
+$groupID = 10;
-r($group->deleteTest()) && p() && e();
\ No newline at end of file
+$group = new groupTest();
+r($group->deleteTest($groupID)) && p() && e('1'); // 删除id为10的组
+r($group->deleteTest(0)) && p() && e('1'); // 删除id为0的组
+system("./ztest init");