|
id => sprintf('%03d', $story->id)));?>
@@ -81,9 +79,14 @@
id&type=story&orderBy=$orderBy"), $lang->goback, '', "class='btn'");?>
+ show('right', 'pagerjs');?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 6f74b29c35..54ab7f2bfb 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -341,7 +341,12 @@
-
+
+ app->rawParams['type'] = 'story';
+ $storyPager->show('right', 'pagerjs');
+ $this->app->rawParams['type'] = $type;
+ ?>
@@ -415,7 +420,12 @@
productplan->batchUnlink, '', 'btn');?>
- productplan->bugSummary, count($planBugs));?>
+ productplan->bugSummary, count($planBugs));?>
+ app->rawParams['type'] = 'bug';
+ $bugPager->show('right', 'pagerjs');
+ $this->app->rawParams['type'] = $type;
+ ?>
diff --git a/module/project/control.php b/module/project/control.php
index 6631a89c6e..7ac0974948 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1249,20 +1249,32 @@ class project extends control
unset($this->lang->project->endList[365]);
}
+ $this->loadModel('user');
+ $poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $project->PO, $this->config->maxCount);
+ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink;
+
+ $pmUsers = $this->user->getPairs('noclosed|nodeleted|pmfirst', $project->PM, $this->config->maxCount);
+ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink;
+
+ $qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $project->QD, $this->config->maxCount);
+ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["QD"] = $this->config->user->moreLink;
+
+ $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $project->RD, $this->config->maxCount);
+ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
+
$this->view->title = $title;
$this->view->position = $position;
$this->view->projects = $projects;
$this->view->project = $project;
- $this->view->poUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pofirst', $project->PO);
- $this->view->pmUsers = $this->user->getPairs('noclosed|nodeleted|pmfirst', $project->PM);
- $this->view->qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $project->QD);
- $this->view->rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $project->RD);
+ $this->view->poUsers = $poUsers;
+ $this->view->pmUsers = $pmUsers;
+ $this->view->qdUsers = $qdUsers;
+ $this->view->rdUsers = $rdUsers;
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->allProducts = $allProducts;
$this->view->linkedProducts = $linkedProducts;
$this->view->productPlans = $productPlans;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
-
$this->display();
}
@@ -1310,14 +1322,27 @@ class project extends control
$this->view->customFields = $customFields;
$this->view->showFields = $this->config->project->custom->batchEditFields;
+ $this->loadModel('user');
+ $pmUsers = $this->user->getPairs('noclosed|nodeleted|pmfirst', $appendPmUsers, $this->config->maxCount);
+ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink;
+
+ $poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $appendPoUsers, $this->config->maxCount);
+ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink;
+
+ $qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $appendQdUsers, $this->config->maxCount);
+ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["QD"] = $this->config->user->moreLink;
+
+ $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendRdUsers, $this->config->maxCount);
+ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
+
$this->view->title = $this->lang->project->batchEdit;
$this->view->position[] = $this->lang->project->batchEdit;
$this->view->projectIDList = $projectIDList;
$this->view->projects = $projects;
- $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $appendPmUsers);
- $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $appendPoUsers);
- $this->view->qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $appendQdUsers);
- $this->view->rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendRdUsers);
+ $this->view->pmUsers = $pmUsers;
+ $this->view->poUsers = $poUsers;
+ $this->view->qdUsers = $qdUsers;
+ $this->view->rdUsers = $rdUsers;
$this->display();
}
@@ -1893,7 +1918,7 @@ class project extends control
$this->loadModel('dept');
$project = $this->project->getById($projectID);
- $users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback');
+ $users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback', '', $this->config->maxCount);
$roles = $this->user->getUserRoles(array_keys($users));
$deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept);
$currentMembers = $this->project->getTeamMembers($projectID);
@@ -1903,6 +1928,7 @@ class project extends control
/* Set menu. */
$this->project->setMenu($this->projects, $project->id);
+ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["accounts[]"] = $this->config->user->moreLink;
$title = $this->lang->project->manageMembers . $this->lang->colon . $project->name;
$position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
@@ -2027,7 +2053,7 @@ class project extends control
}
else
{
- $allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', 'story', 'id_desc', $pager = null, $hasParent = false);
+ $allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', 'story', 'id_desc', $hasParent = false, '', $pager = null);
}
foreach($allStories as $id => $story)
{
@@ -2195,7 +2221,7 @@ class project extends control
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->param = $param;
- $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
+ $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
$this->view->direction = $direction;
$this->display();
}
diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css
index ca418df21d..d26c43a9b8 100644
--- a/module/project/css/dynamic.css
+++ b/module/project/css/dynamic.css
@@ -19,3 +19,4 @@
.dynamic.collapsed .timeline {max-height: 58px;}
.dynamic.collapsed .timeline > li + li {display: none;}
.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; }
+.margin-l-50px {margin-left: 50px;}
diff --git a/module/project/js/managemembers.js b/module/project/js/managemembers.js
index ad634b0871..db7fa3260f 100644
--- a/module/project/js/managemembers.js
+++ b/module/project/js/managemembers.js
@@ -17,9 +17,18 @@ function addItem(obj)
{
var item = $('#addItem').html().replace(/%i%/g, i);
$(obj).closest('tr').after(' |