Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/build/model.php

@@ -395,7 +395,6 @@ class buildModel extends model
         $oldBuild = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
         $build    = fixer::input('post')->stripTags($this->config->build->editor->edit['id'], $this->config->allowedTags)
             ->setDefault('product', $oldBuild->product)
-            ->setDefault('branch', $oldBuild->branch)
             ->cleanInt('product,branch,execution')
             ->remove('allchecker,resolvedBy,files,labels,uid')
             ->get();

module/doc/css/create.css

@@ -1,3 +1,4 @@
 #whiteListBox .input-group:last-child {margin-top: 10px;}
 #mailtoGroup .input-group-btn > .btn {margin-left: -1px !important;}
 #mailtoGroup .chosen-container-single a {border-left-width: 0px;}
+.fullscreen-save, .markdown-fullscreen-save {position: fixed; top: 10px; right: 30px; z-index: 999999;}

module/doc/css/edit.css

@@ -1,2 +1,3 @@
 #whiteListBox .input-group:last-child {margin-top: 10px;}
 #mainContent .main-header h2 {width: 90%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+.fullscreen-save, .markdown-fullscreen-save {position: fixed; top: 10px; right: 30px; z-index: 999999;}

module/doc/js/create.js

@@ -20,6 +20,45 @@ $(function()
     {
         $('.ke-toolbar .ke-outline:last').after("<span data-name='unlink' class='ke-outline' title='Markdown' onclick='toggleEditor(\"markdown\")' style='font-size: unset; line-height: unset;'>Markdown</span>");
     }
+
+    $(document).on("mousedown", 'span[data-name="fullscreen"]', function()
+    {
+        if($(this).hasClass('ke-selected'))
+        {
+            $('#submit').removeClass('fullscreen-save')
+            $('#submit').addClass('btn-wide')
+        }
+        else
+        {
+            $('#submit').addClass('fullscreen-save')
+            $('#submit').removeClass('btn-wide')
+        }
+    });
+
+    $(document).on("mousedown", 'a[title="Fullscreen"],.icon-columns', function()
+    {
+        setTimeout(function()
+        {
+            if($('a[title="Fullscreen"]').hasClass('active'))
+            {
+                $('#submit').addClass('markdown-fullscreen-save')
+                $('#submit').removeClass('btn-wide')
+                $('.fullscreen').css('height', '50px');
+                $('.fullscreen').css('padding-top', '15px');
+                $('.CodeMirror-fullscreen').css('top', '50px');
+                $('.editor-preview-side').css('top', '50px');
+            }
+            else
+            {
+                $('#submit').removeClass('markdown-fullscreen-save')
+                $('#submit').addClass('btn-wide')
+                $('.editor-toolbar').css('height', '30px');
+                $('.editor-toolbar').css('padding-top', '1px');
+                $('.CodeMirror').css('top', '0');
+                $('.editor-preview-side').css('top', '30px');
+            }
+        }, 200);
+    });
 })
 
 function toggleEditor(type)

module/doc/js/edit.js

@@ -22,4 +22,43 @@ $(function()
     });
 
     $('#subNavbar li[data-id="doc"]').addClass('active');
+
+    $(document).on("mousedown", 'span[data-name="fullscreen"]', function()
+    {
+        if($(this).hasClass('ke-selected'))
+        {
+            $('#submit').removeClass('fullscreen-save')
+            $('#submit').addClass('btn-wide')
+        }
+        else
+        {
+            $('#submit').addClass('fullscreen-save')
+            $('#submit').removeClass('btn-wide')
+        }
+    });
+
+    $(document).on("mousedown", 'a[title="Fullscreen"],.icon-columns', function()
+    {
+        setTimeout(function()
+        {
+            if($('a[title="Fullscreen"]').hasClass('active'))
+            {
+                $('#submit').addClass('markdown-fullscreen-save')
+                $('#submit').removeClass('btn-wide')
+                $('.fullscreen').css('height', '50px');
+                $('.fullscreen').css('padding-top', '15px');
+                $('.CodeMirror-fullscreen').css('top', '50px');
+                $('.editor-preview-side').css('top', '50px');
+            }
+            else
+            {
+                $('#submit').removeClass('markdown-fullscreen-save')
+                $('#submit').addClass('btn-wide')
+                $('.editor-toolbar').css('height', '30px');
+                $('.editor-toolbar').css('padding-top', '1px');
+                $('.CodeMirror').css('top', '0');
+                $('.editor-preview-side').css('top', '30px');
+            }
+        }, 200);
+    });
 })

module/execution/control.php

@@ -41,7 +41,7 @@ class execution extends control
         $this->loadModel('project');
 
         $this->executions = $this->execution->getPairs(0, 'all', 'nocode');
-        if(!in_array($this->methodName, array('computeburn', 'ajaxgetdropmenu', 'executionkanban')) and $this->app->openApp == 'execution')
+        if(!in_array($this->methodName, array('computeburn', 'ajaxgetdropmenu', 'executionkanban', 'ajaxgetteammembers')) and $this->app->openApp == 'execution')
         {
             if(!$this->executions and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('execution', 'create'));
         }

module/execution/js/create.js

@@ -53,7 +53,7 @@ $(function()
         });
     })
 
-    $('#teams').change();
+    if(copyExecutionID != 0) $('#teams').change();
 });
 
 function showLifeTimeTips()

module/execution/view/create.html.php

@@ -36,6 +36,7 @@
 <?php js::set('errorSameProducts', $lang->execution->errorSameProducts);?>
 <?php js::set('productID', empty($productID) ? 0 : $productID);?>
 <?php js::set('isStage', false);?>
+<?php js::set('copyExecutionID', $copyExecutionID);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>

module/my/lang/de.php

@@ -102,9 +102,8 @@ $lang->my->projectLinkList['project-index']     = 'By default, go to the most re
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
-$lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview';
-$lang->my->executionLinkList['execution-all']   = 'Enter the execution list by default, you can view all executions';
-$lang->my->executionLinkList['execution-task']  = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+    $lang->my->executionLinkList['execution-task']            = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+    $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
 }
 if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}";
 

module/my/lang/en.php

@@ -109,9 +109,8 @@ $lang->my->projectLinkList['project-index']     = 'By default, go to the most re
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
-$lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview';
-$lang->my->executionLinkList['execution-all']   = 'Enter the execution list by default, you can view all executions';
-$lang->my->executionLinkList['execution-task']  = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+    $lang->my->executionLinkList['execution-task']            = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+    $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
 }
 if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}";
 

module/my/lang/fr.php

@@ -102,9 +102,8 @@ $lang->my->projectLinkList['project-index']     = 'By default, go to the most re
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
-$lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview';
-$lang->my->executionLinkList['execution-all']   = 'Enter the execution list by default, you can view all executions';
-$lang->my->executionLinkList['execution-task']  = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+    $lang->my->executionLinkList['execution-task']            = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+    $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
 }
 if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}";
 

module/my/lang/vi.php

@@ -102,9 +102,8 @@ $lang->my->projectLinkList['project-index']     = 'By default, go to the most re
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
-$lang->my->executionLinkList['execution-index'] = 'Enter the execution dashboard by default, you can understand all the execution statistics and overview';
-$lang->my->executionLinkList['execution-all']   = 'Enter the execution list by default, you can view all executions';
-$lang->my->executionLinkList['execution-task']  = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+    $lang->my->executionLinkList['execution-task']            = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
+    $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
 }
 if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}";
 

module/my/lang/zh-cn.php

@@ -110,7 +110,7 @@ $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
     $lang->my->executionLinkList['execution-task']            = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息';
-    $lang->my->executionLinkList['execution-executionkanban'] = '默认进入执行看板，可以查看所有项目的执行情况';
+    $lang->my->executionLinkList['execution-executionkanban'] = '默认进入执行看板，可以查看进行中项目的执行情况';
 }
 if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "默认进入最近一个{$lang->executionCommon}的任务列表，可以查看当前{$lang->executionCommon}下的任务信息";
 

module/my/lang/zh-tw.php

@@ -109,9 +109,8 @@ $lang->my->projectLinkList['project-index']     = '預設進入最近一個項
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
-    $lang->my->executionLinkList['execution-task']  = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息';
-    $lang->my->executionLinkList['execution-index'] = '預設進入執行儀表盤，可以瞭解所有執行的統計數據和概況';
-    $lang->my->executionLinkList['execution-all']   = '預設進入執行列表，可以查看所有的執行';
+    $lang->my->executionLinkList['execution-task']            = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息';
+    $lang->my->executionLinkList['execution-executionkanban'] = '默認進入執行看板，可以查看進行中項目的執行情况';
 }
 if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "預設進入最近一個{$lang->executionCommon}的任務列表，可以查看當前{$lang->executionCommon}下的任務信息";
 

module/project/js/managemembers.js

@@ -39,6 +39,7 @@ function addItem(obj)
  */
 function deleteItem(obj)
 {
+    if($('.table').find('.addedItem').length <= 1) return;
     $(obj).closest('tr').remove();
 }