From 38fad313d6f94a3cc7b044c04c552cd7eba63996 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 13 Dec 2022 22:35:01 +0800 Subject: [PATCH] * Code for task#79673. --- module/story/js/common.js | 9 ++++++++- module/story/view/blocktwins.html.php | 3 ++- module/story/view/view.html.php | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/module/story/js/common.js b/module/story/js/common.js index 12d4b7e398..561ab1bdb0 100644 --- a/module/story/js/common.js +++ b/module/story/js/common.js @@ -96,13 +96,17 @@ function loadURS(allURS) } $('.twins').mouseover(function() { + if(page == 'edit') return; $(this).parent('ul').find('a.unlink').addClass('hide'); $(this).find('.unlink').removeClass('hide'); }); + $('.twins').mouseenter(function() { $('[data-toggle="popover"]').popover('hide'); }); + $('.twins').mouseout(function() { + if(page == 'edit') return; $(this).find('.unlink').addClass('hide'); }); @@ -142,5 +146,8 @@ function relieve(index) function popoverCancel(index) { - $('[data-id="' + index + '"]').popover('hide').addClass('hide'); + $('[data-id="' + index + '"]').popover('hide'); + if(page == 'edit') return; + + $('[data-id="' + index + '"]').addClass('hide'); } diff --git a/module/story/view/blocktwins.html.php b/module/story/view/blocktwins.html.php index 397f9f83b2..7b4764ec33 100644 --- a/module/story/view/blocktwins.html.php +++ b/module/story/view/blocktwins.html.php @@ -17,12 +17,13 @@ foreach($twins as $twin) $branch = isset($branches[$twin->branch]) ? $branches[$twin->branch] : ''; $stage = $lang->story->stageList[$twin->stage]; $labelClass = $story->branch == $twin->branch ? 'label-primary' : ''; + $hide = $this->app->rawMethod == 'edit' ? '' : 'hide'; echo "
  • "; echo "{$branch} "; echo "{$stage} "; echo ($canViewLinkStory ? html::a($this->createLink('story', 'view', "id=$id", '', true), "$title", '', "class='$class viewlink' data-width='80%'") : "$title"); - if($canRelieved) echo ""; + if($canRelieved) echo ""; echo "
  • "; } ?> diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 9fa6a96f5a..11a5286071 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -15,6 +15,7 @@ session->storyList ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product");?> type);?> +app->rawMethod);?>