Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust code.

Browse Source
This commit is contained in:
wangyidong
2020-01-02 10:00:17 +08:00
parent 7af8e82c0d
commit 3dabfc1b45
12 changed files with 178 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+37
View File
@@ -850,6 +850,7 @@ class projectModel extends model
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
if(empty($projects)) return array();
$projectKeys = array_keys($projects);
$stats = array();
@@ -1120,6 +1121,42 @@ class projectModel extends model
return $query->fetchAll('id');
}
/**
* Get ordered projects.
*
* @param string $status
* @param int $num
* @access public
* @return array
*/
public function getOrderedProjects($status, $num = 0)
{
$projectList = $this->getList($status);
if(empty($projectList)) return $projectList;
$projects = $mineProjects = $otherProjects = $closedProjects = array();
foreach($projectList as $project)
{
if(!$this->app->user->admin and !$this->checkPriv($project->id)) continue;
if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account)
{
$mineProjects[$project->id] = $project;
}
elseif($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account))
{
$otherProjects[$project->id] = $project;
}
elseif($project->status == 'done' or $project->status == 'closed')
{
$closedProjects[$project->id] = $project;
}
}
$projects = $mineProjects + $otherProjects + $closedProjects;
if(empty($num)) return $projects;
return array_slice($projects, 0, $num, true);
}
/**
* Build story search form.
*
module/project/view/story.html.php
+3 -2
View File
@@ -54,8 +54,9 @@
echo "<i class='icon-plus'></i> {$lang->story->create} <span class='caret'></span>";
echo '</button>';
echo "<ul class='dropdown-menu pull-right' id='createActionMenu'>";
if(common::hasPriv('story', 'create')) echo '<li>' . html::a($this->createLink('story', 'create', "productID=$productID&branch=0&moduleID={$this->cookie->storyModuleParam}&story=0&project=$project->id"), $lang->story->create) . '</li>';
if(common::hasPriv('story', 'batchCreate')) echo '<li>' . html::a($this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID={$this->cookie->storyModuleParam}&story=0&project=$project->id"), $lang->story->batchCreate) . '</li>';
$storyModuleID = (int)$this->cookie->storyModuleParam;
if(common::hasPriv('story', 'create')) echo '<li>' . html::a($this->createLink('story', 'create', "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&project=$project->id"), $lang->story->create) . '</li>';
if(common::hasPriv('story', 'batchCreate')) echo '<li>' . html::a($this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&project=$project->id"), $lang->story->batchCreate) . '</li>';
echo '</ul>';
echo '</div>';
}