Merge branch 'sprint/171_liyuchun_16182' into 'sprint/168'

Sprint/171 liyuchun 16182

See merge request easycorp/zentaopms!431

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 =
     {

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')