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

Merge branch 'zhouxin_codereview' into 'master'

Browse Source 
* Code for review.

See merge request easycorp/zentaopms!4001
This commit is contained in:
李玉春
2022-06-17 05:38:33 +00:00
parent b345f5510c 600a10d7ac
commit 6429293b82
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/view.css
+1
View File
@@ -4,3 +4,4 @@
.side-col .cell {padding: 0px;}
.tab-pane table {border: 1px solid #ddd; border-top: none;}
.btn-edit-comment {z-index: 100;}
.modal-body {right: 15px;}
module/bug/js/view.js
+2 -2
View File
@@ -18,7 +18,7 @@ $('#tostory').click(function()
*/
function loadProductExecutions(productID, projectID)
{
link = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=' + projectID +'&branch=' + branchID + '&number=&executionID=0&from=bugToTask');
var link = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=' + projectID +'&branch=' + branchID + '&number=&executionID=0&from=bugToTask');
$('#executionBox').load(link, function()
{
@@ -41,7 +41,7 @@ $('#toTaskButton').on('click', function()
else if(systemMode == 'classic' && executionID)
{
$('#cancelButton').click();
link = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=0&extra=projectID=0&bugID=' + bugID);
var link = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=0&extra=projectID=0&bugID=' + bugID);
window.parent.$.apps.open(link, 'execution');
}
else if(executionID == 0)
module/bug/model.php
+1 -4
View File
@@ -1619,10 +1619,7 @@ class bugModel extends model
if($moduleName == 'contributeBug')
{
$bugsAssignedByMe = $this->loadModel('my')->getAssignedByMe($account, 0, $pager, $orderBy, 0, 'bug');
foreach($bugsAssignedByMe as $bugID => $bug)
{
$bugIDList[$bugID] = $bugID;
}
foreach($bugsAssignedByMe as $bugID => $bug) $bugIDList[$bugID] = $bugID;
}
if($queryID)
module/common/model.php
+6 -6
View File
@@ -46,23 +46,23 @@ class commonModel extends model
public function syncPPEStatus($objectID)
{
global $app;
$thisModule = $app->rawModule;
$rawModule = $app->rawModule;
if($this->config->systemMode == 'classic')
{
if($thisModule == 'task') $this->syncExecutionStatus($objectID);
if($rawModule == 'task') $this->syncExecutionStatus($objectID);
}
if($this->config->systemMode == 'new')
{
if($thisModule == 'task' or $thisModule == 'effort')
if($rawModule == 'task' or $rawModule == 'effort')
{
$taskID = $objectID;
$execution = $this->syncExecutionStatus($taskID);
$project = $this->syncProjectStatus($execution);
$this->syncProgramStatus($project);
}
if($thisModule == 'execution')
if($rawModule == 'execution')
{
$executionID = $objectID;
$execution = $this->dao->select('id, project, grade, parent')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch();
@@ -70,13 +70,13 @@ class commonModel extends model
$project = $this->syncProjectStatus($execution);
$this->syncProgramStatus($project);
}
if($thisModule == 'project')
if($rawModule == 'project')
{
$projectID = $objectID;
$project = $this->dao->select('id, parent, path')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch();
$this->syncProgramStatus($project);
}
if($thisModule == 'program')
if($rawModule == 'program')
{
$programID = $objectID;
$program = $this->dao->select('id, parent, path')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch();
module/doc/model.php
+4 -4
View File
@@ -927,6 +927,7 @@ class docModel extends model
{
$this->config->doc->search['module'] = 'contributeDoc';
$products = $this->product->getPairs();
$this->config->doc->search['params']['project']['values'] = array('' => '') + $this->loadModel('project')->getPairsByProgram() + array('all' => $this->lang->doc->allProjects);
$this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs() + array('all' => $this->lang->doc->allExecutions);
$this->config->doc->search['params']['lib']['values'] = array('' => '') + $this->loadModel('doc')->getLibs('all', 'withObject') + array('all' => $this->lang->doclib->all);
@@ -940,10 +941,9 @@ class docModel extends model
$this->config->doc->search['params']['lib']['values'] = array('' => '', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
}
$this->config->doc->search['actionURL'] = $actionURL;
$this->config->doc->search['queryID'] = $queryID;
$this->config->doc->search['params']['product']['values'] = array('' => '') + $products + array('all' => $this->lang->doc->allProduct);
$this->config->doc->search['actionURL'] = $actionURL;
$this->config->doc->search['queryID'] = $queryID;
$this->config->doc->search['params']['product']['values'] = array('' => '') + $products + array('all' => $this->lang->doc->allProduct);
/* Get the modules. */
$moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($libID, 'doc', $startModuleID = 0);