From fa1ffa32bbae92be370b4d42f0d4263fd33ade2a Mon Sep 17 00:00:00 2001 From: liyuchun Date: Fri, 12 Nov 2021 11:13:37 +0800 Subject: [PATCH 1/2] * Fix bug #16163. --- module/execution/js/kanban.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index f34b90315e..e43e4e874e 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -649,6 +649,7 @@ function resizeKanbanContainer() { var $container = $('#kanbanContainer'); var maxHeight = window.innerHeight - 98 - 15; + if($.cookie('isFullScreen') == 1) maxHeight = window.innerHeight - 15; $container.children('.panel-body').css('max-height', maxHeight); } @@ -683,6 +684,8 @@ $.extend($.fn.kanban.Constructor.DEFAULTS, /* Example code: */ $(function() { + $.cookie('isFullScreen', 0); + /* Common options 用于初始化看板的通用选项 */  var commonOptions = { From 1838b65ad165fca0303604578c9c07a26afc55aa Mon Sep 17 00:00:00 2001 From: liyuchun Date: Fri, 12 Nov 2021 11:29:46 +0800 Subject: [PATCH 2/2] * Fix bug #16182. --- module/product/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/product/model.php b/module/product/model.php index de3ec6e0e7..1b8ce5cdba 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1867,6 +1867,7 @@ class productModel extends model } else if($module == 'doc') { + if($method == 'create' or $method == 'edit') $method = 'tableContents'; $link = helper::createLink('doc', $method, "type=product&objectID=%s&from=product"); } elseif($module == 'design')