diff --git a/module/common/lang/en.php b/module/common/lang/en.php index c34406b0f1..1442b2ce84 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -165,7 +165,7 @@ $lang->project->menu->edit = 'Edit|project|edit|projectID=%s'; $lang->project->menu->delete = array('link' => 'Delete|project|delete|projectID=%s', 'target' => 'hiddenwin'); $lang->project->menu->order = 'Order|project|order|projectID=%s'; $lang->project->menu->create = array('link' => 'New Project|project|create', 'float' => 'right'); -$lang->project->menu->toCopy = array('link' => 'Copy Project|project|create|projectID=©ProjectID=%s', 'float' => 'right'); +$lang->project->menu->copy = array('link' => 'Copy Project|project|create|projectID=©ProjectID=%s', 'float' => 'right'); $lang->project->menu->all = array('link' => 'Project list|project|index|locate=no', 'float' => 'right'); $lang->task->menu = $lang->project->menu; $lang->build->menu = $lang->project->menu; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 11dd91b3b5..8e20b4baef 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -165,7 +165,7 @@ $lang->project->menu->edit = '编辑|project|edit|projectID=%s'; $lang->project->menu->delete = array('link' => '删除|project|delete|projectID=%s', 'target' => 'hiddenwin'); $lang->project->menu->order = '排序|project|order|projectID=%s'; $lang->project->menu->create = array('link' => '新增项目|project|create', 'float' => 'right'); -$lang->project->menu->toCopy = array('link' => '复制项目|project|create|projectID=©ProjectID=%s', 'float' => 'right'); +$lang->project->menu->copy = array('link' => '复制项目|project|create|projectID=©ProjectID=%s', 'float' => 'right'); $lang->project->menu->all = array('link' => '所有项目|project|index|locate=false', 'float' => 'right'); $lang->task->menu = $lang->project->menu; $lang->build->menu = $lang->project->menu; diff --git a/module/project/control.php b/module/project/control.php index a5429c3fad..2fbf9140b9 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -730,7 +730,7 @@ class project extends control exit; } - $teamname = ''; + $team = ''; $products = ''; $whitelist = ''; $acl = ''; @@ -738,7 +738,7 @@ class project extends control if($copyProjectID) { $copyProject = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($copyProjectID)->fetch(); - $teamname = $copyProject->team; + $team = $copyProject->team; $acl = $copyProject->acl; $whitelist = $copyProject->whitelist; $products = join(',', array_keys($this->project->getProducts($copyProjectID))); @@ -760,7 +760,7 @@ class project extends control $this->view->projects = array('' => '') + $this->projects; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->allProducts = $this->loadModel('product')->getPairs(); - $this->view->teamname = $teamname ; + $this->view->team = $team; $this->view->products = $products ; $this->view->whitelist = $whitelist; $this->view->acl = $acl ; diff --git a/module/project/model.php b/module/project/model.php index 0deadc5675..27134f4671 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -165,17 +165,10 @@ class projectModel extends model { $projectID = $this->dao->lastInsertId(); $today = helper::today(); + $existAccount = 0; - if($copyProjectID == '') - { - $member->project = $projectID; - $member->account = $this->app->user->account; - $member->join = $today; - $member->days = $project->days; - $member->hours = $this->config->project->defaultWorkhours; - $this->dao->insert(TABLE_TEAM)->data($member)->exec(); - } - else + /* Copy team of project. */ + if($copyProjectID != '') { $members = $this->dao->select('*')->from(TABLE_TEAM)->where('project')->eq($copyProjectID)->fetchAll(); foreach($members as $member) @@ -184,9 +177,21 @@ class projectModel extends model $member->project = $projectID; $member->join = $today; $this->dao->insert(TABLE_TEAM)->data($member)->exec(); + if($member->account == $this->app->user->account) $existAccount = 1; } } + /* Include account into the team. */ + if($copyProjectID == '' or !$existAccount) + { + $member->project = $projectID; + $member->account = $this->app->user->account; + $member->join = $today; + $member->days = $project->days; + $member->hours = $this->config->project->defaultWorkhours; + $this->dao->insert(TABLE_TEAM)->data($member)->exec(); + } + return $projectID; } } diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 36d4fc19e2..f7e0b00754 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -56,7 +56,7 @@ $(document).ready(function()