diff --git a/module/project/control.php b/module/project/control.php index e7371ae1b7..244ffa49a9 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -139,11 +139,7 @@ class project extends control $pager = new pager($recTotal, $recPerPage, $pageID); $tasks = array(); - if($status == 'byModule') - { - $tasks = $this->loadModel('task')->getTasksByModule($projectID, $this->tree->getAllChildID($moduleID), $orderBy, $pager); - } - elseif($browseType != "bysearch") + if($browseType != "bysearch") { $status = $status == 'byProject' ? 'all' : $status; $tasks = $this->loadModel('task')->getProjectTasks($projectID, $status, $orderBy, $pager); diff --git a/module/project/js/task.js b/module/project/js/task.js index dfce145cc4..33eba8058e 100644 --- a/module/project/js/task.js +++ b/module/project/js/task.js @@ -1,23 +1,5 @@ -/* Browse by module. */ -function browseByModule() -{ - $('#querybox').addClass('hidden'); - $('#featurebar .active').removeClass('active'); - $('#bymoduleTab').addClass('active'); -} - $(function() { - $('#' + browseType + 'Tab').addClass('active'); if(browseType == 'bysearch') ajaxGetSearchForm(); $('.iframe').colorbox({width:900, height:400, iframe:true}); }); - -/* Browse by project. */ -function browseByProject() -{ - $('#querybox').addClass('hidden'); - $('#byProjectTab').addClass('active'); - $('#featurebar .active').removeClass('active'); -} - diff --git a/module/project/model.php b/module/project/model.php index 6251364bf0..c34ec264b2 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -70,6 +70,15 @@ class projectModel extends model { /* Check the privilege. */ $project = $this->getById($projectID); + /* Unset story, bug, build and testtask if type is ops. */ + if($project->type == 'ops') + { + unset($this->lang->project->menu->story); + unset($this->lang->project->menu->bug); + unset($this->lang->project->menu->build); + unset($this->lang->project->menu->testtask); + } + if($projects and !isset($projects[$projectID]) and !$this->checkPriv($project)) { echo(js::alert($this->lang->project->accessDenied)); diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 277a99ef75..47082cfe11 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -21,14 +21,12 @@ var browseType = '';
|
project->projectTasks;?>
|
- - |
name;?>
@@ -42,7 +40,7 @@ var browseType = '';
|
- + |