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

Merge branch 'sprint/220_tianshujie_issue' into 'master'

Browse Source 
Sprint/220 tianshujie issue

See merge request easycorp/zentaopms!4678
This commit is contained in:
孙广明
2022-07-27 05:43:42 +00:00
parent ec9ff2d44d ca01a7540b
commit 69ee2ea498
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/executionblock.html.php
+2
View File
@@ -41,6 +41,8 @@
<?php $id = 0; ?>
<?php foreach($executionStats as $execution):?>
<?php
if(!empty($execution->children)) continue;
$appid = isset($_GET['entry']) ? "class='app-btn text-center' data-id='{$this->get->entry}'" : "class='text-center'";
$viewLink = $this->createLink('execution', 'task', 'executionID=' . $execution->id);
if($config->systemMode == 'new') $execution->name = zget($projectPairs, $execution->project, '') . ' / ' . $execution->name;
module/project/config.php
-6
View File
@@ -184,9 +184,3 @@ $config->project->includedPriv['repo'] = array('create', 'showSyncCommit',
$config->project->includedPriv['testreport'] = array('create', 'view', 'delete', 'edit', 'export');
$config->project->includedPriv['auditplan'] = array('browse', 'create', 'edit', 'batchCreate', 'batchCheck', 'check', 'nc', 'result', 'assignTo');
if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'expectation', 'deleteExpect', 'createExpect', 'editExpect', 'viewExpect');
$config->project->unsetWhitelist['view'] = 'project';
$config->project->unsetWhitelist['manageproducts'] = 'project';
$config->project->unsetWhitelist['team'] = 'project';
$config->project->unsetWhitelist['browse'] = 'stakeholder';
$config->project->unsetWhitelist['group'] = 'project';
$config->project->unsetWhitelist['approval'] = 'project';
module/project/control.php
+1 -1
View File
@@ -1856,7 +1856,7 @@ class project extends control
$this->user->updateUserView($projectID, 'project');
/* Delete the execution under the project. */
$executionIdList = $this->loadModel('execution')->getByProject($projectID);
$executionIdList = $this->loadModel('execution')->getPairs($projectID);
$message = $this->executeHooks($projectID);
if($message) $this->lang->saveSuccess = $message;
module/project/model.php
+2 -4
View File
@@ -2631,10 +2631,8 @@ class projectModel extends model
$this->saveState($objectID, $this->getPairsByProgram());
$project = $this->getById($objectID);
if(isset($project->acl) and $project->acl == 'open' and isset($this->config->project->unsetWhitelist[$methodName]) and $this->config->project->unsetWhitelist[$methodName] == $moduleName)
{
unset($this->lang->project->menu->settings['subMenu']->whitelist);
}
if(isset($project->acl) and $project->acl == 'open') unset($this->lang->project->menu->settings['subMenu']->whitelist);
common::setMenuVars('project', $objectID);
return $objectID;
module/project/view/browsebycard.html.php
+2 -2
View File
@@ -74,7 +74,7 @@
</div>
<?php common::printLink('project', 'export', "status=$browseType&orderBy=$orderBy", "<i class='icon-export muted'> </i>" . $lang->export, '', "class='btn btn-link export'")?>
<?php if(!defined('TUTORIAL')):?>
<?php if(common::hasPriv('project', 'create')) common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary create-project-btn" data-toggle="modal" data-target="#guideDialog"');?>
<?php if(common::hasPriv('project', 'create')) common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary create-project-btn" data-toggle="modal"');?>
<?php else:?>
<?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary create-project-btn"');?>
<?php endif;?>
@@ -88,7 +88,7 @@
<p>
<span class="text-muted"><?php echo $lang->project->empty;?></span>
<?php if(!defined('TUTORIAL')):?>
<?php if(common::hasPriv('project', 'create')) common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal" data-target="#guideDialog"');?>
<?php if(common::hasPriv('project', 'create')) common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal"');?>
<?php else:?>
<?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i> ' . $lang->execution->create, '', 'class="btn btn-info"');?>
<?php endif;?>