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

config/filter.php

@@ -36,6 +36,7 @@ $filter->branch       = new stdclass();
 $filter->qa           = new stdclass();
 $filter->story        = new stdclass();
 $filter->task         = new stdclass();
+$filter->execution    = new stdclass();
 $filter->testcase     = new stdclass();
 $filter->program      = new stdclass();
 $filter->project      = new stdclass();
@@ -215,6 +216,12 @@ $filter->story->export->cookie['checkedItem']       = 'reg::checked';
 $filter->task->create->cookie['lastTaskModule'] = 'int';
 $filter->task->export->cookie['checkedItem']    = 'reg::checked';
 
+$filter->execution->story->cookie['storyPreExecutionID'] = 'int';
+$filter->execution->story->cookie['storyModuleParam']    = 'int';
+$filter->execution->story->cookie['storyProductParam']   = 'int';
+$filter->execution->story->cookie['storyBranchParam']    = 'int';
+$filter->execution->story->cookie['executionStoryOrder'] = 'code';
+
 $filter->testcase->browse->cookie['caseModule']     = 'int';
 $filter->testcase->browse->cookie['caseSuite']      = 'int';
 $filter->testcase->browse->cookie['preBranch']      = 'int';

module/block/view/dashboard.html.php

@@ -121,7 +121,6 @@ $(function()
                 custom: response.data.content,
                 width: 600
             });
-            myModalTrigger.show();
             $('#showAnnual').click(function(){myModalTrigger.close()});
         });
     }

module/common/view/sortable.html.php

@@ -2,7 +2,6 @@
 <style>
 tbody.sortable > tr.drag-shadow {display: none}
 tbody.sortable > tr > td.sort-handler {cursor: move; color: #999;}
-tbody.sortable > tr > td.sort-handler > i {position: relative; top: 2px}
 tbody.sortable-sorting > tr {transition: all .2s; position: relative; z-index: 5; opacity: .3;}
 tbody.sortable-sorting {cursor: move;}
 tbody.sortable-sorting > tr.drag-row {opacity: 1; z-index: 10; box-shadow: 0 2px 4px red}

module/upgrade/js/mergeprogram.js

@@ -158,6 +158,7 @@ $(function()
     /* Select all product events. */
     $('#checkAllProducts').click(function()
     {
+
         var lineID  = $('li.currentPage').attr('lineid');
         var checked = true;
         if($(this).is(':checked'))
@@ -189,6 +190,18 @@ $(function()
         {
             $('[name^=products]').prop('checked', checked);
             $('[name^=sprints]').prop('checked', checked);
+
+            if(checked)
+            {
+                $('[name^=products]').each(function()
+                {
+                    if($(this).prop('checked'))
+                    {
+                        setProgramByProduct($(this));
+                        return false;
+                    }
+                })
+            }
         }
 
         var checkAllLines = isSelectAll(0, 'line');
@@ -225,6 +238,18 @@ $(function()
         {
             $('[name^=products]').prop('checked', checked);
             $('[name^=sprints]').prop('checked', checked);
+
+            if(checked)
+            {
+                $('[name^=products]').each(function()
+                {
+                    if($(this).prop('checked'))
+                    {
+                        setProgramByProduct($(this));
+                        return false;
+                    }
+                })
+            }
         }
 
         var checkAllLines = isSelectAll(0, 'line');