diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php index 7920a0dc86..ffffa96aca 100644 --- a/extension/lite/product/ext/view/browse.html.php +++ b/extension/lite/product/ext/view/browse.html.php @@ -112,7 +112,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; $tab = $isProjectStory ? 'project' : 'product'; $class = common::hasPriv('story', 'export') ? '' : "class=disabled"; $misc = common::hasPriv('story', 'export') ? "data-toggle='modal' data-type='iframe' class='export' data-app='$tab'" : "class=disabled"; - $link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&projectID=0&browseType=$browseType&type=$storyType") : '#'; + $link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&executionID=$projectID&browseType=$browseType&type=$storyType") : '#'; echo "
  • " . html::a($link, $lang->story->export, '', $misc) . "
  • "; ?> @@ -191,7 +191,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
    - tree->manageMenu, '', "class='btn btn-info btn-wide'");?> + tree->manageMenu, '', "class='btn btn-info btn-wide'");?>
    diff --git a/extension/lite/tree/ext/control/browse.php b/extension/lite/tree/ext/control/browse.php new file mode 100644 index 0000000000..1ec13144e1 --- /dev/null +++ b/extension/lite/tree/ext/control/browse.php @@ -0,0 +1,11 @@ +view->projectID = $projectID; + $this->view->projectName = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch('name'); + return parent::browse($rootID, $view, $currentModuleID, $branch, $from); + } +} diff --git a/extension/lite/tree/ext/view/browse.lite.html.hook.php b/extension/lite/tree/ext/view/browse.lite.html.hook.php new file mode 100644 index 0000000000..2504784584 --- /dev/null +++ b/extension/lite/tree/ext/view/browse.lite.html.hook.php @@ -0,0 +1,3 @@ + diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 6f4793f2fc..bad23ca211 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -138,7 +138,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; $tab = $isProjectStory ? 'project' : 'product'; $class = common::hasPriv('story', 'export') ? '' : "class=disabled"; $misc = common::hasPriv('story', 'export') ? "data-toggle='modal' data-type='iframe' class='export' data-app='$tab'" : "class=disabled"; - $link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&projectID=0&browseType=$browseType&type=$storyType") : '#'; + $link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&projectID=0&executionID=0&browseType=$browseType&type=$storyType") : '#'; echo "
  • " . html::a($link, $lang->story->export, '', $misc) . "
  • "; ?> diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 0721db9cd5..9cf64ae901 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -221,7 +221,7 @@ $(function() }, itemCreator: function($li, item) { - var link = (item.id !== undefined && item.type != 'line') ? ('' + item.name + '') : ('' + item.name + ''); + var link = (item.id !== undefined && item.type != 'line') ? ('' + item.name + '') : ('' + item.name + ''); var $toggle = $('' + link + ''); if(item.type === 'bug') $toggle.append('  [B]'); if(item.type === 'case') $toggle.append('  [C]');