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

Merge branch 'sprint/181_tianshujie_optimize' into 'master'

Browse Source 
* Modify the problem of dragging the card.

See merge request easycorp/zentaopms!1227
This commit is contained in:
孙广明
2021-12-31 05:02:09 +00:00
parent 2bb6bb8825 c6794b36f2
commit 94ddbd4852
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/js/browse.js
+7 -6
View File
@@ -157,7 +157,7 @@ function createCardMenu(options)
{
if(card.begin == '2030-01-01' || card.end == '2030-01-01')
{
items.push({label: productplanLang.start, icon: 'start', url: createLink('productplan', 'start', "planID=" + card.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-id': card.id, 'data-width': '550px'}});
items.push({label: productplanLang.start, icon: 'start', url: createLink('productplan', 'start', "planID=" + card.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-id': card.id, 'data-width': '70%'}});
}
else
{
@@ -265,12 +265,13 @@ function changeCardColType(card, fromColType, toColType, kanbanID)
{
if(fromColType == 'wait' && privs.includes('start'))
{
var link = createLink('productplan', 'start', 'planID=' + objectID, '', true);
showIframe = true;
var isOnlyBody = (card.begin == '2030-01-01' || card.end == '2030-01-01') ? true : false;
var link = createLink('productplan', 'start', 'planID=' + objectID, '', isOnlyBody);
showIframe = isOnlyBody;
}
else if((fromColType == 'done' || fromColType == 'closed') && privs.includes('activate'))
{
var link = createLink('productplan', 'activate', 'planID=' + objectID, '', true);
var link = createLink('productplan', 'activate', 'planID=' + objectID);
showIframe = false;
}
}
@@ -278,7 +279,7 @@ function changeCardColType(card, fromColType, toColType, kanbanID)
{
if(fromColType == 'doing')
{
var link = createLink('productplan', 'finish', 'planID=' + objectID, '', true);
var link = createLink('productplan', 'finish', 'planID=' + objectID);
showIframe = false;
}
}
@@ -293,7 +294,7 @@ function changeCardColType(card, fromColType, toColType, kanbanID)
if(showIframe)
{
var modalTrigger = new $.zui.ModalTrigger({type: 'iframe', width: '50%', url: link});
var modalTrigger = new $.zui.ModalTrigger({type: 'iframe', width: '70%', url: link});
modalTrigger.show();
}
else if(!showIframe && link)
module/productplan/model.php
+1 -1
View File
@@ -957,7 +957,7 @@ class productplanModel extends model
if($plan->status != 'done' or $plan->parent < 0) return false;
break;
case 'activate' :
if($plan->status == 'wait' or $plan == 'doing' or $plan->parent < 0) return false;
if($plan->status == 'wait' or $plan->status == 'doing' or $plan->parent < 0) return false;
break;
}
module/productplan/view/browsebylist.html.php
+1 -1
View File
@@ -155,7 +155,7 @@
if($plan->begin == '2030-01-01' or $plan->end == '2030-01-01')
{
$class = 'iframe';
$attr = "data-id='{$plan->id}' data-width='550px'";
$attr = "data-id='{$plan->id}' data-width='70%'";
$isOnlyBody = true;
}
common::printIcon('productplan', 'start', "planID=$plan->id", $plan, 'list', 'play', '', $class, $isOnlyBody, $attr);