diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 7785d4410e..4c8fd30763 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -57,10 +57,10 @@ $lang->mainNav->menuOrder[50] = 'admin'; $lang->my->menu = new stdclass(); $lang->my->menu->index = array('link' => "$lang->dashboard|my|index"); $lang->my->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'subModule' => 'todo', 'alias' => 'todo'); -$lang->my->menu->work = array('link' => "{$lang->my->work}|my|work|mode=task", 'subModule' => 'task,review'); +$lang->my->menu->work = array('link' => "{$lang->my->work}|my|work|mode=task", 'subModule' => 'task'); if($config->systemMode == 'new') $lang->my->menu->project = array('link' => "{$lang->project->common}|my|project|"); $lang->my->menu->execution = array('link' => "{$lang->execution->common}|my|execution|type=undone"); -$lang->my->menu->contribute = array('link' => "$lang->contribute|my|contribute|mode=task", 'subModule' => 'review'); +$lang->my->menu->contribute = array('link' => "$lang->contribute|my|contribute|mode=task"); $lang->my->menu->dynamic = array('link' => "$lang->dynamic|my|dynamic|"); if($config->systemScore) $lang->my->menu->score = array('link' => "{$lang->score->shortCommon}|my|score|", 'subModule' => 'score'); $lang->my->menu->contacts = array('link' => "$lang->contact|my|managecontacts|"); @@ -113,7 +113,7 @@ $lang->my->dividerMenu = ',work,dynamic,'; /* Program menu. */ $lang->program->homeMenu = new stdclass(); -$lang->program->homeMenu->browse = array('link' => "{$lang->program->list}|program|browse|"); +$lang->program->homeMenu->browse = array('link' => "{$lang->program->list}|program|browse|", 'alias' => 'create'); $lang->program->menu = new stdclass(); $lang->program->menu->product = array('link' => "{$lang->product->common}|program|product|programID=%s", 'alias' => 'view'); diff --git a/module/execution/control.php b/module/execution/control.php index 2e1da26665..45b6407b93 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1177,6 +1177,7 @@ class execution extends control $this->view->title = $title; $this->view->position = $position; + $this->view->deptUsers = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid'); $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable. $this->display(); diff --git a/module/execution/js/team.js b/module/execution/js/team.js new file mode 100644 index 0000000000..d58ba42f6b --- /dev/null +++ b/module/execution/js/team.js @@ -0,0 +1,4 @@ +function checkUserDept(userID) +{ + alert(noAccess); +} diff --git a/module/execution/model.php b/module/execution/model.php index 5232010824..0947eb1b95 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1378,8 +1378,8 @@ class executionModel extends model if(strpos($taskQuery, "`execution` =") === false) $taskQuery = $taskQuery . " AND `execution` = $executionID"; $executionQuery = "`execution` " . helper::dbIN(array_keys($executions)); $taskQuery = str_replace("`execution` = 'all'", $executionQuery, $taskQuery); // Search all execution. - $this->session->set('taskQueryCondition', $taskQuery); - $this->session->set('taskOnlyCondition', true); + $this->session->set('taskQueryCondition', $taskQuery, $this->app->openApp); + $this->session->set('taskOnlyCondition', true, $this->app->openApp); $tasks = $this->getSearchTasks($taskQuery, $pager, $sort); } diff --git a/module/execution/view/team.html.php b/module/execution/view/team.html.php index 64c9f952c0..642471af10 100644 --- a/module/execution/view/team.html.php +++ b/module/execution/view/team.html.php @@ -12,6 +12,7 @@ ?> execution->confirmUnlinkMember)?> +user->error->noAccess)?>