From 0b13f868128fef25770f7a730d1e2cd7a0a4c167 Mon Sep 17 00:00:00 2001
From: dingna <dingna@easycorp.ltd>
Date: Fri, 29 Oct 2021 09:23:53 +0800
Subject: [PATCH] * Code update for task * 43401,#43507,#43398.

---
 module/execution/control.php          | 2 +-
 module/execution/js/kanban.js         | 2 +-
 module/execution/view/kanban.html.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 30335035d5..e03dd8c3d0 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1879,7 +1879,7 @@ class execution extends control
         $this->view->kanbanGroup   = $kanbanGroup;
         $this->view->execution     = $execution;
         $this->view->type          = $type;
-        $this->view->group         = $group;
+        $this->view->groupBy       = $groupBy;
         $this->view->canBeChanged  = $canBeChanged;
 
         $this->display();
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index fcfd0b6eb9..c26126eb48 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -745,6 +745,6 @@ $('.c-group').change(function()
 
     var type  = $('#type').val();
     var group = $('#group').val();
-    link = createLink('execution', 'kanban', 'executionID=' + executionID + '&type=' + type + '&orderBy=order_asc' + '&group=' + group);
+    link = createLink('execution', 'kanban', 'executionID=' + executionID + '&type=' + type + '&orderBy=order_asc' + '&groupBy=' + group);
     location.href = link;
 });
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 7d10874a4c..47205d2ff7 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -18,7 +18,7 @@
       <?php echo html::select('type', $lang->kanban->type, $type, 'class="form-control chosen" data-max_drop_width="215"');?>
     </div>
     <div class="input-control space c-group">
-      <?php echo html::select('group',  $lang->kanban->group->$type, $group, 'class="form-control chosen" data-max_drop_width="215"');?>
+      <?php echo html::select('group',  $lang->kanban->group->$type, $groupBy, 'class="form-control chosen" data-max_drop_width="215"');?>
     </div>
   </div>
   <div class='btn-toolbar pull-right'>