Merge branch 'zentaopms_266_task#77611' into 'master'
* Finish task #77611. See merge request easycorp/zentaopms!6392
This commit is contained in:
@@ -621,8 +621,6 @@ class buildModel extends model
|
||||
{
|
||||
$action = strtolower($action);
|
||||
|
||||
if($module == 'testtask' && $action == 'create') return !!$object->execution;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
$config->testtask = new stdclass();
|
||||
$config->testtask->create = new stdclass();
|
||||
$config->testtask->edit = new stdclass();
|
||||
$config->testtask->create->requiredFields = 'execution,build,begin,end,name';
|
||||
$config->testtask->edit->requiredFields = 'execution,build,begin,end,name';
|
||||
$config->testtask->create->requiredFields = 'build,begin,end,name';
|
||||
$config->testtask->edit->requiredFields = 'build,begin,end,name';
|
||||
|
||||
$config->testtask->importUnit = new stdclass();
|
||||
$config->testtask->importUnit->requiredFields = 'execution,build,begin,end,name,resultFile';
|
||||
|
||||
@@ -517,7 +517,7 @@ class testtask extends control
|
||||
|
||||
/* Get execution type and set assignedToList. */
|
||||
$execution = $this->execution->getById($task->execution);
|
||||
if($execution->acl == 'private')
|
||||
if($execution and $execution->acl == 'private')
|
||||
{
|
||||
$assignedToList = $this->loadModel('user')->getTeamMemberPairs($execution->id, 'execution', 'nodeleted');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user