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

Merge branch 'sprint/221_tianshujie_fixbug' into 'master'

Browse Source 
Sprint/221 tianshujie fixbug

See merge request easycorp/zentaopms!4781
This commit is contained in:
王怡栋
2022-08-04 02:34:54 +00:00
parent 8f95fc6bb2 e0aaa4c18c
commit fc494cc0f6
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/all.css
+3 -4
View File
@@ -1,10 +1,9 @@
body {margin-bottom: 25px;}
.main-table tbody>tr>td {border-bottom: 0px solid #eee;}
.table-responsive {overflow-y: hidden !important;}
#product_chosen .chosen-single {width: 180px;}
.table-children {border-left: 2px solid #cbd0db; border-right: 2px solid #cbd0db;}
.table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
.table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
.table td.has-child > a:not(.plan-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
.table td.has-child > .plan-toggle {color: #838a9d; position: relative; top: 1px;overflow: initial !important;}
.table td.has-child > .plan-toggle:hover {color: #006af1; cursor: pointer;}
@@ -14,7 +13,7 @@ body {margin-bottom: 25px;}
.table th.hours {padding-right: 8px !important;}
.main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: -1px;}
td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;}
td.datatable-cell.flex {margin-bottom: -2px;}
td.flex span.label-badge {margin-left: 5px; min-width: 50px;}
td.flex span.label-badge.label-light {min-width: 22px;}
@@ -32,7 +31,7 @@ td.flex span.project-type-label {min-width: 40px;}
.c-project{text-overflow: unset !important;}
canvas {height: 28px;}
.parent.has-child.c-name.flex, .table-child-bottom > .c-name.flex {border-bottom: 1px solid #cbd0db !important;}
.parent.has-child.c-name.flex, .table-child-bottom > .c-name.flex {border-bottom: 0px solid #cbd0db !important;}
.parent.has-child.c-name.flex {margin-bottom: -2px !important;}
#tableCustomBtn {padding-bottom: 5px;}
#bysearchTab {margin-left: 5px;}
module/story/view/view.html.php
+21 -18
View File
@@ -494,7 +494,7 @@
foreach($builds as $build)
{
$link = common::hasPriv('build', 'view') ? html::a($this->createLink('build', 'view', "buildID=$build->id"), "#$build->id $build->name", '', "data-app='{$tab}'") : "#$build->id $build->name";
echo "<li title='$build->id $build->name'>$link</li>";
echo "<li title='$build->name'>$link</li>";
}
?>
</ul>
@@ -510,7 +510,7 @@
foreach($releases as $release)
{
$link = common::hasPriv($releaseModule, 'view') ? html::a($this->createLink($releaseModule, 'view', "release=$release->id"), "#$release->id $release->name", '', "data-app='{$tab}'") : "#$release->id $release->name";
echo "<li title='$release->id $release->name'>$link</li>";
echo "<li title='$release->name'>$link</li>";
}
?>
</ul>
@@ -519,22 +519,25 @@
<tr class='text-top'>
<th class='w-90px'><?php echo $lang->story->linkStories;?></th>
<td>
<?php
if(isset($story->linkStoryTitles))
{
foreach($story->linkStoryTitles as $linkStoryID => $linkStoryTitle)
{
if($app->user->admin or strpos(",{$app->user->view->products},", ",{$storyProducts[$linkStoryID]},") !== false)
{
echo '[S] ' . html::a($this->createLink('story', 'view', "storyID=$linkStoryID", '', true), "#$linkStoryID $linkStoryTitle", '', "class='iframe' data-width='80%' title='$linkStoryTitle'") . '<br />';
}
else
{
echo "<div title='$linkStoryTitle'>[S] #$linkStoryID $linkStoryTitle</div>";
}
}
}
?>
<ul class='list-unstyled'>
<?php
if(isset($story->linkStoryTitles))
{
foreach($story->linkStoryTitles as $linkStoryID => $linkStoryTitle)
{
if($app->user->admin or strpos(",{$app->user->view->products},", ",{$storyProducts[$linkStoryID]},") !== false)
{
$storyLink = html::a($this->createLink('story', 'view', "storyID=$linkStoryID", '', true), "[S] #$linkStoryID $linkStoryTitle", '', "class='iframe' data-width='80%' title='$linkStoryTitle'") . '<br />';
}
else
{
$storyLink = "[S] #$linkStoryID $linkStoryTitle";
}
echo "<li title='$linkStoryTitle'>$storyLink</li>";
}
}
?>
</ul>
</td>
</tr>
<tr>