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

Merge branch 'sprint/237_tianshujie_bug' into 'master'

Browse Source 
Sprint/237 tianshujie bug

See merge request easycorp/zentaopms!5264
This commit is contained in:
王怡栋
2022-09-05 07:45:45 +00:00
parent 1562e2c4a8 1078a4ebc9
commit 7cc59a9177
5 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/todoblock.html.php
+26 -23
View File
@@ -37,6 +37,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
.block-todoes .todo-flexbetween {display: flex; justify-content: space-between;}
.block-todoes #todoList {display: flex; overflow: hidden;}
.block-todoes .label-todo {width: 50px; min-width: 50px!important; border: none; color: #43A047;}
.block-todoes .todo-title.text-ellipsis {text-overflow: unset;}
[lang^='en'] .block-todoes .todo-pri {width: 60px; min-width: 60px;}
</style>
<div class='block-todoes'>
@@ -93,29 +94,31 @@ if(!$selfCall) die(include('./todolist.html.php'));
</div>
</form>
</div>
<ul class="todoes">
<?php foreach($todos as $id => $todo):?>
<?php
$appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
$viewLink = $this->createLink('todo', 'view', "todoID={$todo->id}&from=my", 'html', true);
?>
<li data-id='<?php echo $todo->id?>' class='titleBox'>
<span class="todo-check icon icon-check-circle"></span>
<a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe todo-flexbetween' data-width='1000px' data-toggle='modal' <?php echo $appid?>>
<div id='todoList'>
<?php if ($todo->date == '2030-01-01') :?>
<div class="todo-time"><?php echo $lang->todo->periods['future'] ?></div>
<?php else:?>
<div class="todo-time"><?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?></div>
<?php endif;?>
<div class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></div>
<div class="todo-title text-ellipsis" title='<?php echo $todo->name;?>'><?php echo $todo->name;?></div>
</div>
<span class="label label-id label-todo hidden"><?php echo $lang->block->done;?></span>
</a>
</li>
<?php endforeach;?>
</ul>
<div class='table-row'>
<ul class="todoes">
<?php foreach($todos as $id => $todo):?>
<?php
$appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
$viewLink = $this->createLink('todo', 'view', "todoID={$todo->id}&from=my", 'html', true);
?>
<li data-id='<?php echo $todo->id?>' class='titleBox'>
<span class="todo-check icon icon-check-circle"></span>
<a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe todo-flexbetween' data-width='1000px' data-toggle='modal' <?php echo $appid?>>
<div id='todoList'>
<?php if ($todo->date == '2030-01-01') :?>
<div class="todo-time"><?php echo $lang->todo->periods['future'] ?></div>
<?php else:?>
<div class="todo-time"><?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?></div>
<?php endif;?>
<div class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></div>
<div class="todo-title text-ellipsis" title='<?php echo $todo->name;?>'><?php echo $todo->name;?></div>
</div>
<span class="label label-id label-todo hidden"><?php echo $lang->block->done;?></span>
</a>
</li>
<?php endforeach;?>
</ul>
</div>
</div>
<script>
$(function()
module/productplan/model.php
+2 -1
View File
@@ -930,7 +930,8 @@ class productplanModel extends model
->fetchPairs();
if(isset($branchPlanPairs[$plan->branch])) $branchPlanPairs[$plan->branch] = $planID;
$plansOfStory = ',' . implode(',', $branchPlanPairs);
$plansOfStory = implode(',', $branchPlanPairs);
$plansOfStory = trim($plansOfStory, ',');
$this->dao->update(TABLE_STORY)->set("plan")->eq($plansOfStory)->where('id')->eq((int)$storyID)->exec();
module/story/model.php
+2 -1
View File
@@ -1958,7 +1958,8 @@ class storyModel extends model
{
if(!empty($oldStory->plan) and isset($branchPlanPairs[$plan->branch]) and $branchPlanPairs[$plan->branch] != $planID) $unlinkPlans[$branchPlanPairs[$plan->branch]] = empty($unlinkPlans[$branchPlanPairs[$plan->branch]]) ? $storyID : "{$unlinkPlans[$branchPlanPairs[$plan->branch]]},$storyID";
if(isset($branchPlanPairs[$plan->branch])) $branchPlanPairs[$plan->branch] = $planID;
$story->plan = $oldStory->plan ? ',' . implode(',', $branchPlanPairs) : ",$planID";
$story->plan = $oldStory->plan ? implode(',', $branchPlanPairs) : $planID;
$story->plan = trim($story->plan, ',');
if($story->plan != $oldStory->plan and !empty($planID)) $link2Plans[$planID] = empty($link2Plans[$planID]) ? $storyID : "{$link2Plans[$planID]},$storyID";
}
}
module/tree/js/browse.js
-2
View File
@@ -76,6 +76,4 @@ $(document).ready(function()
{
toggleCopy(false);
$('[data-id="edit"] a').modalTrigger({type: 'iframe', width: 500});
parent.$('#triggerModal .modal-content .modal-header .close').on('click', function(){parent.location.reload();});
});
module/tree/view/browse.html.php
+2
View File
@@ -335,6 +335,8 @@ $(function()
if(window.config.viewType == 'line') $('#modulemenu > .nav > li > a[href*=product][href*=all]').parent('li[data-id=all]').addClass('active');
if(viewType == 'case' || viewType == 'caselib') $('#subNavbar li[data-id="' + viewType +'"]').addClass('active');
});
if("<?php $from == 'doc'?>") parent.$('#triggerModal .modal-content .modal-header .close').on('click', function(){parent.location.reload();});
</script>
<style>
.module-name {display: inline-block; max-width: calc(100% - 85px); white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}