diff --git a/module/execution/control.php b/module/execution/control.php index 444bedbfef..67bf3835e2 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2925,7 +2925,7 @@ class execution extends control * @access public * @return void */ - public function all($status = 'all', $projectID = 0, $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1) + public function all($status = 'all', $projectID = 0, $orderBy = 'order_asc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1) { $this->app->loadLang('my'); $this->app->loadLang('product'); diff --git a/module/execution/js/all.js b/module/execution/js/all.js index 057d4360c4..be30acdd24 100644 --- a/module/execution/js/all.js +++ b/module/execution/js/all.js @@ -1,10 +1,10 @@ $(function() { - $('#projectTableList').on('sort.sortable', function(e, data) + $('#executionTableList').on('sort.sortable', function(e, data) { var list = ''; for(i = 0; i < data.list.length; i++) list += $(data.list[i].item).attr('data-id') + ','; - $.post(createLink('project', 'updateOrder'), {'projects' : list, 'orderBy' : orderBy}); + $.post(createLink('execution', 'updateOrder'), {'executions' : list, 'orderBy' : orderBy}); }); }); diff --git a/module/project/control.php b/module/project/control.php index 2d79da1139..fc734a7fa0 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -811,7 +811,7 @@ class project extends control * @access public * @return void */ - public function execution($status = 'all', $projectID = 0, $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1) + public function execution($status = 'all', $projectID = 0, $orderBy = 'order_asc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1) { $uri = $this->app->getURI(true); $this->app->session->set('executionList', $uri, 'project');