+ session->productPlanList ? $this->session->productPlanList : inlink('browse', "planID=$plan->id");?>
+
+
- session->productPlanList ? $this->session->productPlanList : inlink('browse', "planID=$plan->id");?>
-
-
id;?>
title;?>
deleted):?>
diff --git a/module/project/control.php b/module/project/control.php
index 9ec782038a..8c602a128f 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -569,10 +569,10 @@ class project extends control
$stories = $this->story->getProjectStories($projectID, $sort, $type, $param, $pager);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
- $users = $this->user->getPairs('noletter');
+ $users = $this->user->getPairs('noletter');
/* Get project's product. */
- $productID = 0;
+ $productID = 0;
$productPairs = $this->loadModel('product')->getProductsByProject($projectID);
if($productPairs) $productID = key($productPairs);
@@ -600,9 +600,9 @@ class project extends control
/* Count T B C */
$storyIdList = array_keys($stories);;
- $storyTasks = $this->loadModel('task')->getStoryTaskCounts($storyIdList, $projectID);
- $storyBugs = $this->loadModel('bug')->getStoryBugCounts($storyIdList, $projectID);
- $storyCases = $this->loadModel('testcase')->getStoryCaseCounts($storyIdList);
+ $storyTasks = $this->loadModel('task')->getStoryTaskCounts($storyIdList, $projectID);
+ $storyBugs = $this->loadModel('bug')->getStoryBugCounts($storyIdList, $projectID);
+ $storyCases = $this->loadModel('testcase')->getStoryCaseCounts($storyIdList);
$plans = $this->project->getPlans($productID);
$allPlans = array('' => '');
@@ -614,6 +614,11 @@ class project extends control
}
}
+ if($type == 'byModule')
+ {
+ $this->view->module = $this->loadModel('tree')->getById($param);
+ }
+
/* Assign. */
$this->view->title = $title;
$this->view->position = $position;
diff --git a/module/project/js/story.js b/module/project/js/story.js
index b1801313a4..d431ad2e34 100644
--- a/module/project/js/story.js
+++ b/module/project/js/story.js
@@ -1,7 +1,5 @@
$(function()
{
- ajaxGetSearchForm();
-
$('#storyList').on('sort.sortable', function(e, data)
{
var list = '';
@@ -36,7 +34,6 @@ $(function()
function showCheckedSummary()
{
- console.log('test');
var $summary = $('#main #mainContent form.main-table .table-header .table-statistic');
var checkedTotal = 0;
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 3e907fb63b..11715e1556 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -14,11 +14,11 @@
-
- icons['bug']);?> project->bug;?>
+ bug->allBugs;?>
recTotal;?>
Build:' . $build->name . '';?>
- bug->search;?>
+ bug->search;?>
" . $lang->bug->export, '', "class='btn btn-link export iframe'");?>
diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php
index 080f6a9a47..c7a676cced 100644
--- a/module/project/view/linkstory.html.php
+++ b/module/project/view/linkstory.html.php
@@ -15,79 +15,79 @@
project->linkStory;?>
- server->http_referer, ' ' . $lang->goback, '', "class='btn btn-link'")?>
+
+ server->http_referer, 'btn btn-link');?>
+
-
-
+
+
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index a2097a84d5..fa8271f01d 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -20,33 +20,24 @@
', '', 'btn btn-icon btn-sm btn-info sidebar-toggle');?>
+ name)):?>
+
+ id&orderBy=$orderBy&type=$type¶m=0&recTotal=0&recPerPage={$pager->recPerPage}");?>
+ name;?>
+ ", '', "class='text-muted'");?>
+
+
name;?>
+
- createLink('project', 'story', "project=$project->id"), "{$lang->project->story}", '', "class='btn btn-link btn-active-text'");?>
- createLink('project', 'storykanban', "project=$project->id"), "{$lang->project->kanban}", '', "class='btn btn-link'");?>
+ createLink('project', 'story', "projectID=$project->id"), "{$lang->story->allStories}{$pager->recTotal}", '', "class='btn btn-link btn-active-text'");?>
+ createLink('project', 'storykanban', "projectID=$project->id"), "{$lang->project->kanban}", '', "class='btn btn-link'");?>
+ product->searchStory;?>
-
lang->story->create = $this->lang->project->createStory;
- if($productID and !$this->loadModel('story')->checkForceReview())
- {
- echo "
';
}
+
+ $this->lang->story->create = $this->lang->project->createStory;
+ if($productID and !$this->loadModel('story')->checkForceReview())
+ {
+ common::printLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", " " . $lang->story->batchCreate, '', "class='btn btn-secondary'");
+ common::printLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", " " . $lang->story->create, '', "class='btn btn-primary'");
+ }
?>
- ";
- common::printIcon('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id");
-
- $misc = common::hasPriv('story', 'batchCreate') ? '' : "disabled";
- $link = common::hasPriv('story', 'batchCreate') ? $this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id") : '#';
- echo "';
- echo "
';
- }
+ common::printLink('story', 'export', "productID=$productID&orderBy=id_desc", " " . $lang->story->export, '', "class='btn btn-link export'");
if(commonModel::isTutorialMode())
{
@@ -68,12 +59,17 @@
}
echo '- ";
- echo "
- " . html::a($link, $lang->story->batchCreate, '', "class='$misc'") . " "; - echo '
@@ -81,6 +77,7 @@
+
diff --git a/module/tree/model.php b/module/tree/model.php
index 699c667a9e..d3d81d35fe 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -829,7 +829,7 @@ class treeModel extends model
{
$projectID = $extra['projectID'];
$productID = $extra['productID'];
- return html::a(helper::createLink('project', 'story', "root={$projectID}&orderBy=&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+ return html::a(helper::createLink('project', 'story', "projectID={$projectID}&orderBy=&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
}
/**
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 3a7a5b0c93..4bf54ce46a 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -102,7 +102,8 @@
- save, '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', "btn btn-wide");?>
+ save, '', 'btn btn-wide btn-primary');?>
+
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index 35724b4248..a06aa69273 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -94,7 +94,8 @@
- save, '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', "btn btn-wide");?>
+ save, '', 'btn btn-wide btn-primary');?>
+