diff --git a/module/product/control.php b/module/product/control.php index 63878a2edf..51fd8435b7 100755 --- a/module/product/control.php +++ b/module/product/control.php @@ -220,6 +220,7 @@ class product extends control $this->view->modulePairs = $modulePairs; $this->view->project = $project; $this->view->recTotal = $pager->recTotal; + $this->view->isProjectStory = $isProjectStory; $this->display(); } diff --git a/module/product/js/browse.ui.js b/module/product/js/browse.ui.js new file mode 100644 index 0000000000..1627f2f133 --- /dev/null +++ b/module/product/js/browse.ui.js @@ -0,0 +1,3 @@ +window.footerGenerator = function(summary) { + return [{children: summary, className: "text-dark"}, "flex", "pager"]; +} diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php index 1ec46cf19d..fea5d8301e 100644 --- a/module/product/ui/browse.html.php +++ b/module/product/ui/browse.html.php @@ -70,7 +70,7 @@ foreach($stories as $story) } } -useData('storyBrowseType', $storyBrowseType); +data('storyBrowseType', $storyBrowseType); featureBar ( @@ -116,14 +116,6 @@ toolbar ))) ); -js -(<< loadModel('story'); $lang->story->createCommon = $storyType == 'story' ? $lang->story->createStory : $lang->story->createRequirement; $unfoldStories = isset($config->product->browse->unfoldStories) ? json_decode($config->product->browse->unfoldStories, true) : array(); $unfoldStories = zget($unfoldStories, $productID, array()); @@ -313,7 +314,6 @@ js::set('vision', $this->config->vision); $canBatchAssignTo = ($canBeChanged and common::hasPriv($storyType, 'batchAssignTo')); $canBatchUnlink = ($canBeChanged and $projectHasProduct and common::hasPriv('projectstory', 'batchUnlinkStory')); $canBatchImportToLib = ($canBeChanged and $isProjectStory and isset($this->config->maxVersion) and common::hasPriv('story', 'batchImportToLib') and helper::hasFeature('storylib')); - $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlink or $canBatchImportToLib or $canBatchChangeBranch); ?> ';?>