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

Merge branch 'sprint/167_zenggang_43179' into 'sprint/167'

Browse Source 
* Finish task#43179

See merge request easycorp/zentaopms!49
This commit is contained in:
朱金勇
2021-10-15 01:05:33 +00:00
parent 22dab31b5f de37a33ed5
commit e50c3c65d9
2 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+44 -15
View File
@@ -403,26 +403,55 @@ class commonModel extends model
}
$showCreateList = true;
$isOnlyBody = $objectType == 'doc';
$attr = $objectType == 'doc' ? "class='iframe' data-width='650px'" : '';
$isOnlyBody = false;
$attr = '';
$params = '';
if($objectType == 'doc')
switch($objectType)
{
$params = "objectType=&objectID=0&libID=0";
$createMethod = 'selectLibType';
case 'doc':
$params = "objectType=&objectID=0&libID=0";
$createMethod = 'selectLibType';
$isOnlyBody = true;
$attr = "class='iframe' data-width='650px'";
break;
case 'project':
if(isset($config->maxVersion) and!defined('TUTORIAL'))
{
$params = "programID=0&copyProjectID=0&extra=from=global";
$createMethod = 'createGuide';
$attr = 'data-toggle="modal" data-target="#guideDialog"';
}
else
{
$params = "model=scrum&programID=0&copyProjectID=0&extra=from=global";
}
break;
case 'bug':
$params = "productID=$productID&branch=&extras=from=global";
break;
case 'story':
$params = "productID=$productID&branch=0&moduleID=0&storyID=0&objectID=0&bugID=0&planID=0&todoID=0&extra=from=global";
break;
case 'task':
$params = "executionID=0&storyID=0&moduleID=0&taskID=0&todoID=0&extra=from=global";
break;
case 'testcase':
$params = "productID=$productID&branch=&moduleID=0&from=&param=0&storyID=0&extras=from=global";
break;
case 'execution':
$params = "projectID=&executionID=0&copyExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global";
break;
case 'product':
$params = "programID=&extra=from=global";
break;
case 'program':
$params = "parentProgramID=0&extra=from=global";
break;
}
if($objectType == 'bug') $params = "productID=$productID&branch=&extras=from=global";
if($objectType == 'story') $params = "productID=$productID&branch=0&moduleID=0&storyID=0&objectID=0&bugID=0&planID=0&todoID=0&extra=from=global";
if($objectType == 'task') $params = "executionID=0&storyID=0&moduleID=0&taskID=0&todoID=0&extra=from=global";
if($objectType == 'testcase') $params = "productID=$productID&branch=&moduleID=0&from=&param=0&storyID=0&extras=from=global";
if($objectType == 'execution') $params = "projectID=&executionID=0&copyExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global";
if($objectType == 'project') $params = "model=scrum&programID=0&copyProjectID=0&extra=from=global";
if($objectType == 'product') $params = "programID=&extra=from=global";
if($objectType == 'program') $params = "parentProgramID=0&extra=from=global";
$html .= '<li>' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), "<i class='icon icon-$objectIcon'></i> " . $lang->createObjects[$objectType], '', $isOnlyBody ? $attr : '') . '</li>';
$html .= '<li>' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), "<i class='icon icon-$objectIcon'></i> " . $lang->createObjects[$objectType], '', $attr) . '</li>';
}
}
module/project/view/createguide.html.php
+2 -2
View File
@@ -17,14 +17,14 @@
<div class='row'>
<div class='col-xs-6'>
<div class='project-type text-center'>
<?php echo html::a($this->createLink("project", "create", "model=scrum&projectID=$projectID"), "<img class='project-type-img' data-type='scrum' src='{$config->webRoot}theme/default/images/main/scrum.png'>", '', "data-app='{$app->tab}'")?>
<?php echo html::a($this->createLink("project", "create", "model=scrum&projectID=$projectID"), "<img class='project-type-img' data-type='scrum' src='{$config->webRoot}theme/default/images/main/scrum.png'>", '', "data-app='project'")?>
<h3><?php echo $lang->project->scrum; ?></h3>
<p><?php echo $lang->project->scrumTitle; ?></p>
</div>
</div>
<div class='col-xs-6'>
<div class='project-type text-center'>
<?php echo html::a($this->createLink("project", "create", "model=waterfall&projectID=$projectID"), "<img class='project-type-img' data-type='waterfall' src='{$config->webRoot}theme/default/images/main/waterfall.png'>", '', "data-app='{$app->tab}'")?>
<?php echo html::a($this->createLink("project", "create", "model=waterfall&projectID=$projectID"), "<img class='project-type-img' data-type='waterfall' src='{$config->webRoot}theme/default/images/main/waterfall.png'>", '', "data-app='project'")?>
<h3><?php echo $lang->project->waterfall; ?></h3>
<p><?php echo $lang->project->waterfallTitle; ?></p>
</div>