diff --git a/framework/router.class.php b/framework/router.class.php index 415e3480b9..b567dfe6bf 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -152,8 +152,6 @@ class router extends baseRouter if($this->session->PRJ) $model = $this->dbh->query('SELECT model FROM' . TABLE_PROJECT . "WHERE id = {$this->session->PRJ}")->fetch(); - $lang->URCommon = ''; - $lang->SRCommon = ''; foreach($commonSettings as $setting) { if($setting->key == 'productProject') list($productIndex, $projectIndex) = explode('_', $setting->value); diff --git a/module/program/control.php b/module/program/control.php index 714d43dbcb..731b9b39f2 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -564,7 +564,7 @@ class program extends control if(!empty($_POST)) { $this->project->manageMembers($projectID); - die(js::locate($this->createLink('program', 'browse'), 'parent')); + die(js::locate($this->createLink('program', 'pgmbrowse'), 'parent')); } /* Load model. */ @@ -695,7 +695,7 @@ class program extends control foreach($closedProjects as $project) $closedProjectNames = common::convert2Pinyin($closedProjectNames); $closedProjectsHtml = ''; - foreach($closedProjects as $project) $closedProjectsHtml .= html::a(inLink('index'), '' . $project->name); + foreach($closedProjects as $project) $closedProjectsHtml .= html::a($this->createLink('program', 'index', '', '', '', $project->id), '' . $project->name); $this->view->projectID = $projectID; $this->view->module = $module; @@ -1069,7 +1069,7 @@ class program extends control } } - $this->display('group', 'managePriv'); + $this->display(); } /** diff --git a/module/program/js/common.js b/module/program/js/common.js index 4f3ee6a1a3..0d6bc3c7da 100644 --- a/module/program/js/common.js +++ b/module/program/js/common.js @@ -109,3 +109,21 @@ function computeEndDate(delta) $('#end').val(endDate).datetimepicker('update'); computeWorkDays(); } + +$(function() +{ + $('#privList > tbody > tr > th input[type=checkbox]').change(function() + { + var id = $(this).attr('id'); + var checked = $(this).prop('checked'); + + if(id == 'allChecker') + { + $('input[type=checkbox]').prop('checked', checked); + } + else + { + $(this).parents('tr').find('input[type=checkbox]').prop('checked', checked); + } + }); +}) diff --git a/module/program/model.php b/module/program/model.php index 9f69f4ae03..853da83ead 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1180,7 +1180,7 @@ class programModel extends model */ public function createPRJManageLink($project) { - $link = $project->type == 'program' ? helper::createLink('program', 'PRJbrowse', "programID={$project->id}") : helper::createLink('program', 'index', "projectID={$project->id}"); + $link = $project->type == 'program' ? helper::createLink('program', 'PRJbrowse', "programID={$project->id}") : helper::createLink('program', 'index', "projectID={$project->id}", '', '', $project->id); $icon = $project->type == 'program' ? ' ' : ' '; return html::a($link, $icon . $project->name, '_self', "id=project{$project->id} title='{$project->name}' class='text-ellipsis'"); } diff --git a/module/program/view/prjmanagepriv.html.php b/module/program/view/prjmanagepriv.html.php new file mode 100644 index 0000000000..ffc6326693 --- /dev/null +++ b/module/program/view/prjmanagepriv.html.php @@ -0,0 +1,187 @@ + + * @package group + * @version $Id: managepriv.html.php 4129 2013-01-18 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +?> + + + +role == 'limited'):?> +