diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js index f3f7a0ebba..7ffd255fce 100644 --- a/module/productplan/js/browse.js +++ b/module/productplan/js/browse.js @@ -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) diff --git a/module/productplan/model.php b/module/productplan/model.php index 8a1d88be5a..8a657e3041 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -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; } diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php index 236571474e..c9f139d791 100644 --- a/module/productplan/view/browsebylist.html.php +++ b/module/productplan/view/browsebylist.html.php @@ -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);