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

* adjust code for the task #707.

Browse Source
This commit is contained in:
shiyangyangwork@yahoo.cn
2012-02-22 06:15:07 +00:00
parent 53e4c8dc1e
commit 3b8b357fce
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/en.php
+1 -1
View File
@@ -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=&copyProjectID=%s', 'float' => 'right');
$lang->project->menu->copy = array('link' => 'Copy Project|project|create|projectID=&copyProjectID=%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;
module/common/lang/zh-cn.php
+1 -1
View File
@@ -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=&copyProjectID=%s', 'float' => 'right');
$lang->project->menu->copy = array('link' => '复制项目|project|create|projectID=&copyProjectID=%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;
module/project/control.php
+3 -3
View File
@@ -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 ;
module/project/model.php
+15 -10
View File
@@ -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;
}
}
module/project/view/create.html.php
+1 -1
View File
@@ -56,7 +56,7 @@ $(document).ready(function()
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->teamname;?></th>
<td><?php echo html::input('team', $teamname, "class='text-3'");?></td>
<td><?php echo html::input('team', $team, "class='text-3'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->manageProducts;?></th>