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

* Fix bug #29177,29172.

Browse Source
This commit is contained in:
tanghucheng
2022-11-02 15:24:43 +08:00
parent 3821cc3e53
commit fa92ed247f
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
-3
View File
@@ -2758,9 +2758,6 @@ class story extends control
$siblings = str_replace(",$siblingID", '', $story->siblings);
/* If siblings == ,$siblingID, update siblings empty.*/
if(count(explode(',', $siblings)) == 3) $siblings = '';
/* batchUnset siblingID from siblings.*/
$replaceSql = "UPDATE " . TABLE_STORY . " SET siblings = REPLACE(siblings,',$siblingID,', ',') WHERE `product` = $story->product";
$this->dbh->exec($replaceSql);
module/story/css/common.css
+2 -1
View File
@@ -27,5 +27,6 @@
.popover-icon {float:left;}
.popover .content {margin-left:25px;overflow: overlay;}
.hide {display:none !important;}
.sibling > a.iframe{padding:6px;white-space: nowrap;overflow: hidden;display: inline-flex;max-width: 80%;}
.sibling > a.viewlink {padding:6px;white-space: nowrap;overflow: hidden;display: inline-flex;max-width: 70%;}
.sibling > span {max-width: 60px;white-space: nowrap;overflow: hidden;}
.tooltip-inner {max-width: 500px;}
module/story/view/blocksibling.html.php
+3 -2
View File
@@ -8,6 +8,7 @@ js::set('cancel', $lang->cancel);
$canViewLinkStory = common::hasPriv('story', 'view');
$canRelieved = common::hasPriv('story', 'relieved');
array_unshift($siblings, $story);
$class = isonlybody() ? 'showinonlybody' : 'iframe';
foreach($siblings as $sibling)
{
@@ -15,8 +16,8 @@ foreach($siblings as $sibling)
$title = $id . ' '. $sibling->title;
$branch = $story->branch == $sibling->branch ? $lang->story->currentBranch : $branches[$sibling->branch];
echo "<li title='$title' class='sibling'>";
echo "<span class='label label-outline label-badge'>{$branch}</span> ";
echo ($canViewLinkStory ? html::a($this->createLink('story', 'view', "id=$id", '', true), "$title", '', "class='iframe' data-width='80%'") : "$id $title");
echo "<span class='label label-outline label-badge' title='$branch'>{$branch}</span> ";
echo ($canViewLinkStory ? html::a($this->createLink('story', 'view', "id=$id", '', true), "$title", '', "class='$class viewlink' data-width='80%'") : "$id $title");
if($canRelieved) echo "<a class='unlink hide' data-id='$id' data-toggle='popover'><i class='icon icon-unlink btn-info'></i></a>";
echo "</li>";
}