Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Yagami
2019-02-22 11:16:57 +08:00
parent 4305c3a54c 838bb873b9
commit 34555b1e8d
14 changed files with 171 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+28 -28
View File
@@ -134,8 +134,8 @@ class bugModel extends model
{
$now = helper::now();
$bug = fixer::input('post')
->add('openedBy', $this->app->user->account)
->add('openedDate', $now)
->setDefault('openedBy', $this->app->user->account)
->setDefault('openedDate', $now)
->setDefault('project,story,task', 0)
->setDefault('openedBuild', '')
->setDefault('deadline', '0000-00-00')
@@ -611,9 +611,9 @@ class bugModel extends model
->setDefault('plan', 0)
->setDefault('deadline', '0000-00-00')
->setDefault('resolvedDate', '0000-00-00 00:00:00')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setIF(strpos($this->config->bug->edit->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->join('openedBuild', ',')
->join('mailto', ',')
->join('linkBug', ',')
@@ -919,15 +919,15 @@ class bugModel extends model
$now = helper::now();
$oldBug = $this->getById($bugID);
$bug = fixer::input('post')
->add('resolvedBy', $this->app->user->account)
->add('status', 'resolved')
->add('confirmed', 1)
->add('assignedDate', $now)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->setDefault('resolvedDate', $now)
->setDefault('duplicateBug', 0)
->setDefault('assignedTo', $oldBug->openedBy)
->add('status', 'resolved')
->add('confirmed', 1)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('resolvedBy', $this->app->user->account)
->setDefault('assignedDate', $now)
->setDefault('resolvedDate', $now)
->setDefault('duplicateBug', 0)
->setDefault('assignedTo', $oldBug->openedBy)
->remove('comment,files,labels')
->get();
@@ -1122,8 +1122,11 @@ class bugModel extends model
$oldBug = $this->getById($bugID);
$now = helper::now();
$bug = fixer::input('post')
->setDefault('assignedTo', $oldBug->resolvedBy)
->add('assignedDate', $now)
->setDefault('assignedTo', $oldBug->resolvedBy)
->setDefault('assignedDate', $now)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('activatedDate', $now)
->add('resolution', '')
->add('status', 'active')
->add('resolvedDate', '0000-00-00')
@@ -1134,9 +1137,6 @@ class bugModel extends model
->add('duplicateBug', 0)
->add('toTask', 0)
->add('toStory', 0)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->add('activatedDate', $now)
->join('openedBuild', ',')
->remove('comment,files,labels')
->get();
@@ -1160,14 +1160,14 @@ class bugModel extends model
$now = helper::now();
$oldBug = $this->getById($bugID);
$bug = fixer::input('post')
->add('assignedTo', 'closed')
->add('assignedDate', $now)
->add('status', 'closed')
->add('closedBy', $this->app->user->account)
->add('closedDate', $now)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->add('confirmed', 1)
->add('assignedTo', 'closed')
->add('status', 'closed')
->add('confirmed', 1)
->setDefault('assignedDate', $now)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('closedBy', $this->app->user->account)
->setDefault('closedDate', $now)
->remove('comment')
->get();
@@ -1967,8 +1967,8 @@ class bugModel extends model
public function saveUserBugTemplate()
{
$template = fixer::input('post')
->add('account', $this->app->user->account)
->add('type', 'bug')
->setDefault('account', $this->app->user->account)
->setDefault('type', 'bug')
->stripTags('content', $this->config->allowedTags)
->get();
module/doc/control.php
+7 -1
View File
@@ -532,7 +532,7 @@ class doc extends control
* @access public
* @return void
*/
public function sort()
public function sort($type = '')
{
if($_POST)
{
@@ -543,6 +543,12 @@ class doc extends control
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->send(array('result' => 'success'));
}
if($type)
{
$this->view->libs = $this->doc->getLibs($type);
$this->display();
}
}
/**
module/doc/css/alllibs.css
-4
View File
@@ -1,4 +0,0 @@
#libs .libs-group-heading{border:1px solid #ddd;overflow:hidden}
#libs .libs-group{border:1px solid #ddd; border-top:0px;overflow:hidden; margin-bottom:20px;}
#libs .libs-group.libs-custom{border-top:1px solid #ddd;overflow:hidden; margin-bottom:20px;}
#libs .lib-custom{width:130px; margin-bottom:10px;}
module/doc/css/index.css
-13
View File
@@ -1,14 +1 @@
.lib-heading{border-right:1px solid #ddd;}
.lib-more a.more{font-weight:bold; display:block;}
#libs .libs-group-heading{border:1px solid #ddd;}
#libs .libs-group{border:1px solid #ddd; border-top:0px; margin-bottom:20px;}
#libs .libs-group.lib-more{border:0px; text-align:center; height:120px; line-height:110px;}
#libs .libs-group.lib-more:hover{background-color: #EBF2F9}
#libs .libs-custom-heading{text-align:center; height:120px; line-height:110px; position: relative; margin-bottom:20px;}
#libs .libs-custom-heading:hover{background-color: #EBF2F9}
#libs .libs-custom-heading a{display:block;height:100%;}
#libs .libs-custom-heading .lable-custom{position: absolute;left:8px;}
#libs hr {margin-top:0px;}
#libs .panel-body {overflow: auto; max-height: 224px;}
#pageActions ul.dropdown-menu{left: 67px}
module/doc/js/common.js
-1
View File
@@ -80,7 +80,6 @@ $(document).ready(function()
}
}, 'json');
}
});
'use strict';
module/doc/lang/zh-cn.php
+2 -1
View File
@@ -141,7 +141,8 @@ $lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star';
$lang->doc->customObjectLibs['files'] = '显示附件库';
$lang->doc->customObjectLibs['customFiles'] = '显示自定义文档库';
$lang->doc->customShowLibs = '文档库显示设置';
$lang->doc->orderLib = '文档库排序';
$lang->doc->customShowLibs = '显示设置';
$lang->doc->customShowLibsList['zero'] = '显示空文档的库';
$lang->doc->customShowLibsList['unclosed'] = '只显示未关闭的项目';
module/doc/view/side.html.php
+91 -1
View File
@@ -161,7 +161,20 @@ if(empty($type)) $type = 'product';
<?php endforeach;?>
</div>
</div>
<div class='side-footer'><?php echo html::a('###', "<i class='icon-cog'></i> {$lang->doc->customShowLibs}", '', "class='setting text-secondary small' data-target='#settingModal' data-toggle='modal'");?></div>
<div class='side-footer clearfix'>
<div class='pull-left'>
<?php echo html::a('###', "<i class='icon-cog'></i> {$lang->doc->customShowLibs}", '', "class='setting text-secondary small' data-target='#settingModal' data-toggle='modal'");?>
</div>
<div class='pull-right'>
<?php
if(common::hasPriv('doc', 'sort'))
{
echo html::a('###', "{$lang->doc->orderLib}", '', "id='orderLib' class='text-secondary small " . (($type != 'product' and $type !='project') ? '' : 'hidden') . "'");
echo html::a('javascript:cancelOrder()', "<i class='icon-back icon-sm'></i> {$lang->goback}", '', "id='cancelOrder' class='text-secondary small hidden'");
}
?>
</div>
</div>
</div>
<div class='modal fade' id='settingModal' aria-hidden="true">
<div class='modal-dialog mw-400px'>
@@ -185,4 +198,81 @@ if(empty($type)) $type = 'product';
</div>
</div>
</div>
<?php js::set('goback', $lang->goback);?>
<script>
$(function()
{
if($.cookie('docSideType'))
{
var type = $.cookie('docSideType');
var $tabs = $('#mainRow .side-col .tabs');
if($tabs.find('.tab-content .tab-pane#' + type).length >0)
{
$tabs.find('.nav-tabs li').removeClass('active');
$tabs.find('.nav-tabs li a[href="#' + type + '"]').parent().addClass('active');
$tabs.find('.tab-content .tab-pane').removeClass('active');
$tabs.find('.tab-content .tab-pane#' + type).addClass('active');
}
$.cookie('docSideType', '');
$('#mainRow .side-col .side-footer #orderLib').toggleClass('hidden', (type == 'product' || type == 'project'));
}
$('#mainRow .side-col .tabs .nav-tabs li a').click(function()
{
var href = $(this).attr('href');
$(this).closest('.side-col').find('.side-footer #orderLib').toggleClass('hidden', (href.indexOf('product') > 0 || href.indexOf('project') > 0));
});
$('#orderLib').click(function()
{
var $tabPane = $('#mainRow .side-col .tabs .tab-content .tab-pane.active');
var type = $tabPane.attr('id');
$.get(createLink('doc', 'sort', "type=" + type), function(data)
{
$tabPane.find('ul.tree').addClass('hidden');
$tabPane.find('.libs-group.sort').remove();
$tabPane.closest('.side-col').find('.side-footer .pull-right #orderLib').addClass('hidden');
$tabPane.closest('.side-col').find('.side-footer .pull-right #cancelOrder').removeClass('hidden');
$tabPane.append(data);
$tabPane.find('.libs-group.sort').sortable(
{
trigger: '.lib',
selector: '.lib',
finish: function()
{
var orders = {};
var orderNext = 1;
$('.libs-group.sort .lib').not('.files').not('.addbtn').each(function()
{
orders[$(this).data('id')] = orderNext ++;
});
$.post(createLink('doc', 'sort'), orders, function(data)
{
if(data.result == 'success')
{
$.cookie('docSideType', type);
return location.reload();
}
else
{
bootbox.alert(data.message);
}
}, 'json');
}
});
});
});
});
function cancelOrder()
{
var $tabPane = $('#mainRow .side-col .tabs .tab-content .tab-pane.active');
$tabPane.find('.libs-group.sort').remove();
$tabPane.find('ul.tree').removeClass('hidden');
$tabPane.closest('.side-col').find('.side-footer .pull-right #orderLib').removeClass('hidden');
$tabPane.closest('.side-col').find('.side-footer .pull-right #cancelOrder').addClass('hidden');
}
</script>
</div>
module/doc/view/sort.html.php
+9
View File
@@ -0,0 +1,9 @@
<div class='libs-group sort'>
<style>
.libs-group.sort {padding-left:15px;}
.libs-group.sort .lib {padding:4px 0 4px 6px;cursor: pointer; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
</style>
<?php foreach($libs as $libID => $libName):?>
<div class='lib' data-id='<?php echo $libID;?>'><i class='icon-move'></i> <?php echo $libName;?></div>
<?php endforeach;?>
</div>
module/productplan/view/browse.html.php
+2 -2
View File
@@ -52,7 +52,7 @@
<?php endif;?>
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<th class='w-140px'><?php common::printOrderLink('title', $orderBy, $vars, $lang->productplan->title);?></th>
<th class='w-160px'><?php common::printOrderLink('title', $orderBy, $vars, $lang->productplan->title);?></th>
<?php if($this->session->currentProductType != 'normal'):?>
<th class='w-100px'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->product->branch);?></th>
<?php endif;?>
@@ -97,7 +97,7 @@
<?php echo sprintf('%03d', $plan->id);?>
<?php endif;?>
</td>
<td class='text-left<?php if($plan->parent == '-1') echo ' has-child';?>' title="<?php echo $plan->title?>">
<td class='c-title text-left<?php if($plan->parent == '-1') echo ' has-child';?>' title="<?php echo $plan->title?>">
<?php
echo html::a(inlink('view', "id=$plan->id"), $plan->title);
if($plan->parent == '-1') echo '<a class="task-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-double-right"></i></a>';
module/story/model.php
+18 -18
View File
@@ -147,12 +147,12 @@ class storyModel extends model
->cleanInt('product,module,pri,plan')
->cleanFloat('estimate')
->callFunc('title', 'trim')
->setDefault('plan,verify', '')
->add('openedBy', $this->app->user->account)
->add('openedDate', $now)
->add('assignedDate', 0)
->add('version', 1)
->add('status', 'draft')
->setDefault('plan,verify', '')
->setDefault('openedBy', $this->app->user->account)
->setDefault('openedDate', $now)
->setIF($this->post->assignedTo != '', 'assignedDate', $now)
->setIF($this->post->needNotReview or $projectID > 0, 'status', 'active')
->setIF($this->post->plan > 0, 'stage', 'planned')
@@ -416,8 +416,8 @@ class storyModel extends model
$now = helper::now();
$story = fixer::input('post')
->callFunc('title', 'trim')
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setIF($this->post->assignedTo != $oldStory->assignedTo, 'assignedDate', $now)
->setIF($specChanged, 'version', $oldStory->version + 1)
->setIF($specChanged and $oldStory->status == 'active' and $this->post->needNotReview == false, 'status', 'changed')
@@ -478,9 +478,9 @@ class storyModel extends model
$story = fixer::input('post')
->cleanInt('product,module,pri,duplicateStory')
->cleanFloat('estimate')
->add('assignedDate', $oldStory->assignedDate)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->setDefault('assignedDate', $oldStory->assignedDate)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('plan', '')
->setDefault('status', $oldStory->status)
->setDefault('product', $oldStory->product)
@@ -688,8 +688,8 @@ class storyModel extends model
$story = fixer::input('post')
->remove('result,preVersion,comment')
->setDefault('reviewedDate', $date)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setIF($this->post->result == 'pass' and $oldStory->status == 'draft', 'status', 'active')
->setIF($this->post->result == 'pass' and $oldStory->status == 'changed', 'status', 'active')
->setIF($this->post->result == 'reject', 'closedBy', $this->app->user->account)
@@ -831,14 +831,14 @@ class storyModel extends model
$oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
$now = helper::now();
$story = fixer::input('post')
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->add('closedDate', $now)
->add('closedBy', $this->app->user->account)
->add('assignedTo', 'closed')
->add('assignedDate', $now)
->add('status', 'closed')
->add('stage', 'closed')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('closedDate', $now)
->setDefault('closedBy', $this->app->user->account)
->setDefault('assignedDate', $now)
->removeIF($this->post->closedReason != 'duplicate', 'duplicateStory')
->removeIF($this->post->closedReason != 'subdivided', 'childStories')
->setIF($this->post->closedReason == 'done', 'stage', 'released')
@@ -1098,9 +1098,6 @@ class storyModel extends model
$oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
$now = helper::now();
$story = fixer::input('post')
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->add('assignedDate', $now)
->add('closedBy', '')
->add('closedReason', '')
->add('closedDate', '0000-00-00')
@@ -1108,6 +1105,9 @@ class storyModel extends model
->add('reviewedDate', '0000-00-00')
->add('duplicateStory', 0)
->add('childStories', '')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('assignedDate', $now)
->remove('comment')
->get();
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq($storyID)->exec();
module/task/model.php
+4 -4
View File
@@ -616,8 +616,8 @@ class taskModel extends model
->setIF($this->post->status == 'wait' and $this->post->left == $oldTask->left and $this->post->consumed == 0 and $this->post->estimate, 'left', $this->post->estimate)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags)
->join('mailto', ',')
->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu')
@@ -626,7 +626,7 @@ class taskModel extends model
if($task->consumed < $oldTask->consumed) die(js::error($this->lang->task->error->consumedSmall));
/* Fix bug#1388, Check children task projectID and moduleID. */
if($task->project != $oldTask->project)
if(isset($task->project) and $task->project != $oldTask->project)
{
$this->dao->update(TABLE_TASK)->set('project')->eq($task->project)->set('module')->eq($task->module)->where('parent')->eq($taskID)->exec();
}
@@ -705,7 +705,7 @@ class taskModel extends model
{
if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $taskID);
if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);
if($task->parent)
if(!empty($task->parent))
{
$this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($task->parent)->exec();
$this->updateParentStatus($taskID);
module/testcase/model.php
+7 -7
View File
@@ -185,11 +185,11 @@ class testcaseModel extends model
{
$now = helper::now();
$case = fixer::input('post')
->add('openedBy', $this->app->user->account)
->add('openedDate', $now)
->add('status', $this->forceNotReview() || $this->post->forceNotReview ? 'normal' : 'wait')
->add('version', 1)
->add('fromBug', $bugID)
->setDefault('openedBy', $this->app->user->account)
->setDefault('openedDate', $now)
->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion((int)$this->post->story))
->remove('steps,expects,files,labels,stepType,forceNotReview')
->setDefault('story', 0)
@@ -676,11 +676,11 @@ class testcaseModel extends model
$version = $stepChanged ? $oldCase->version + 1 : $oldCase->version;
$case = fixer::input('post')
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->add('version', $version)
->setIF($this->post->story != false and $this->post->story != $oldCase->story, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
->setDefault('story,branch', 0)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('story,branch', 0)
->join('stage', ',')
->join('linkCase', ',')
->remove('comment,steps,expects,files,labels,stepType')
@@ -752,8 +752,8 @@ class testcaseModel extends model
$case = fixer::input('post')
->remove('result,comment')
->setDefault('reviewedDate', substr($now, 0, 10))
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setIF($this->post->result == 'pass', 'status', 'normal')
->join('reviewedBy', ',')
->get();
module/testtask/model.php
+2 -2
View File
@@ -915,8 +915,8 @@ class testtaskModel extends model
->add('run', $runID)
->add('caseResult', $caseResult)
->setForce('stepResults', serialize($stepResults))
->add('lastRunner', $this->app->user->account)
->add('date', $now)
->setDefault('lastRunner', $this->app->user->account)
->setDefault('date', $now)
->skipSpecial('stepResults')
->remove('steps,reals,result')
->get();
module/tree/model.php
+1 -1
View File
@@ -112,7 +112,7 @@ class treeModel extends model
ksort($treeMenu);
$topMenu = @array_shift($treeMenu);
$topMenu = explode("\n", trim($topMenu));
$lastMenu[] = in_array($type, array('bug', 'story')) ? '' : '/';
$lastMenu[] = '/';
foreach($topMenu as $menu)
{
if(!strpos($menu, '|')) continue;