diff --git a/module/execution/control.php b/module/execution/control.php
index 27a71cf6e5..83e3c5e8b0 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -679,7 +679,7 @@ class execution extends control
* @access public
* @return void
*/
- public function story($executionID = 0, $orderBy = 'order_desc', $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
+ public function story($executionID = 0, $orderBy = 'order_asc', $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
{
/* Load these models. */
$this->loadModel('story');
diff --git a/module/execution/js/story.js b/module/execution/js/story.js
index cc62255f89..85903c09fb 100644
--- a/module/execution/js/story.js
+++ b/module/execution/js/story.js
@@ -10,7 +10,7 @@ $(function()
$target.hide();
$target.fadeIn(1000);
order = 'order_asc'
- history.pushState({}, 0, createLink('project', 'story', "executionID=" + executionID + '&orderBy=' + order));
+ history.pushState({}, 0, createLink('execution', 'story', "executionID=" + executionID + '&orderBy=' + order));
});
});
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index ddc55901e9..486bf36df5 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -46,8 +46,8 @@
createLink('execution', 'story', "executionID=$execution->id&orderBy=order_desc&type=all"), "{$lang->story->allStories}" . ($type == 'all' ? " {$pager->recTotal}" : ''), '', "class='btn btn-link" . ($type == 'all' ? " btn-active-text" : '') . "'");
- echo html::a($this->createLink('execution', 'story', "executionID=$execution->id&orderBy=order_desc&type=unclosed"), "{$lang->story->unclosed}" . ($type == 'unclosed' ? " {$pager->recTotal}" : ''), '', "class='btn btn-link" . ($type == 'unclosed' ? " btn-active-text" : '') . "'");
+ echo html::a($this->createLink('execution', 'story', "executionID=$execution->id&orderBy=order_asc&type=all"), "{$lang->story->allStories}" . ($type == 'all' ? " {$pager->recTotal}" : ''), '', "class='btn btn-link" . ($type == 'all' ? " btn-active-text" : '') . "'");
+ echo html::a($this->createLink('execution', 'story', "executionID=$execution->id&orderBy=order_asc&type=unclosed"), "{$lang->story->unclosed}" . ($type == 'unclosed' ? " {$pager->recTotal}" : ''), '', "class='btn btn-link" . ($type == 'unclosed' ? " btn-active-text" : '') . "'");
}
if(common::hasPriv('execution', 'storykanban')) echo html::a($this->createLink('execution', 'storykanban', "executionID=$execution->id"), "{$lang->execution->kanban}", '', "class='btn btn-link'");
?>