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

Merge branch 'master' into 'sprint/211_tianshujie_58557'

Browse Source 
# Conflicts:
#   module/testcase/css/create.css
This commit is contained in:
王怡栋
2022-07-06 06:47:25 +00:00
parent 16a8bcf5f6 1eec0e603f
commit f25fcc1eb2
155 changed files with 1893 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/create.html.php
+3 -3
View File
@@ -18,7 +18,7 @@ js::set('holders', $lang->bug->placeholder);
js::set('page', 'create');
js::set('createRelease', $lang->release->create);
js::set('createBuild', $lang->build->create);
js::set('refresh', $lang->refresh);
js::set('refresh', $lang->refreshIcon);
js::set('flow', $config->global->flow);
js::set('stepsRequired', $stepsRequired);
js::set('stepsNotEmpty', $lang->bug->stepsNotEmpty);
@@ -70,7 +70,7 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
echo "<span class='input-group-addon'>";
echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug&currentModuleID=0&branch=$branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
echo '&nbsp; ';
echo html::a("javascript:void(0)", $lang->refresh, '', "class='refresh' onclick='loadProductModules($productID)'");
echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' title='$lang->refresh' onclick='loadProductModules($productID)'");
echo '</span>';
}
?>
@@ -313,7 +313,7 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
<td>
<div class='input-group'>
<?php if($showStory):?>
<span class='input-group-addon'><?php echo $lang->bug->task?></span>
<span class='input-group-addon task'><?php echo $lang->bug->task?></span>
<?php endif;?>
<?php echo html::select('task', '', $taskID, "class='form-control chosen'") . html::hidden('oldTaskID', $taskID);?>
</div>