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

+ complete task #312:add linkpruduct to createproject and editproject page.

Browse Source
This commit is contained in:
fujia
2010-11-17 08:15:11 +00:00
parent 2ad03cefc0
commit 0fa4af0743
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module/project/control.php
View File

@@ -371,6 +371,7 @@ class project extends control
if(!empty($_POST))
{
$projectID = $this->project->create();
$this->project->updateProducts($projectID);
if(dao::isError()) die(js::error(dao::getError()));
$this->loadModel('action')->create('project', $projectID, 'opened');
die(js::locate($this->createLink('project', 'tips', "projectID=$projectID"), 'parent'));
@@ -383,6 +384,7 @@ class project extends control
$this->view->position[] = $this->view->header->title;
$this->view->projects = array('' => '') + $this->projects;
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->allProducts = $this->loadModel('product')->getPairs();
$this->display();
}
@@ -393,6 +395,7 @@ class project extends control
if(!empty($_POST))
{
$changes = $this->project->update($projectID);
$this->project->updateProducts($projectID);
if(dao::isError()) die(js::error(dao::getError()));
if($changes)
{
@@ -416,13 +419,18 @@ class project extends control
$position[] = html::a($browseProjectLink, $project->name);
$position[] = $this->lang->project->edit;
$linkedProducts = $this->project->getProducts($project->id);
$linkedProducts = join(',', array_keys($linkedProducts));
/* 赋值。*/
$this->view->header = $header;
$this->view->position = $position;
$this->view->projects = $projects;
$this->view->project = $project;
$this->view->users = $this->loadModel('user')->getPairs('noclosed,nodeleted');
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->header = $header;
$this->view->position = $position;
$this->view->projects = $projects;
$this->view->project = $project;
$this->view->users = $this->loadModel('user')->getPairs('noclosed,nodeleted');
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->allProducts = $this->loadModel('product')->getPairs();
$this->view->linkedProducts = $linkedProducts;
$this->display();
}

2
module/project/model.php
View File

@@ -88,6 +88,7 @@ class projectModel extends model
->specialChars('goal, desc')
->setIF($this->post->acl != 'custom', 'whitelist', '')
->join('whitelist', ',')
->remove('products')
->get();
$this->dao->insert(TABLE_PROJECT)->data($project)
->autoCheck($skipFields = 'begin,end')
@@ -124,6 +125,7 @@ class projectModel extends model
->setIF($this->post->end == '0000-00-00', 'end', '')
->setIF($this->post->acl != 'custom', 'whitelist', '')
->join('whitelist', ',')
->remove('products')
->get();
$this->dao->update(TABLE_PROJECT)->data($project)
->autoCheck($skipFields = 'begin,end')

4
module/project/view/create.html.php
View File

@@ -42,6 +42,10 @@ function setWhite(acl)
<th class='rowhead'><?php echo $lang->project->teamname;?></th>
<td><?php echo html::input('team', '', "class='text-3'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
<td><?php echo html::checkbox("products", $allProducts, '');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->goal;?></th>
<td><?php echo html::textarea('goal', '', "rows='5' class='area-1'");?></td>

4
module/project/view/edit.html.php
View File

@@ -63,6 +63,10 @@ function setWhite(acl)
<th class='rowhead'><?php echo $lang->project->RM;?></th>
<td><?php echo html::select('RM', $users, $project->RM, 'class=text-3');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
<td><?php echo html::checkbox("products", $allProducts, $linkedProducts);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->goal;?></th>
<td><?php echo html::textarea('goal', $project->goal, "rows='5' class='area-1'");?></td>