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

* change 'delay' to 'put off'.

Browse Source
This commit is contained in:
zhujinyong
2013-01-18 08:41:32 +00:00
parent e04296deed
commit 7ea61a8c29
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/project/control.php
View File

@@ -933,14 +933,14 @@ class project extends control
* @access public
* @return void
*/
public function delay($projectID)
public function putoff($projectID)
{
$this->commonAction($projectID);
if(!empty($_POST))
{
$this->loadModel('action');
$changes = $this->project->delay($projectID);
$changes = $this->project->putoff($projectID);
if(dao::isError()) die(js::error(dao::getError()));
if($this->post->comment != '' or !empty($changes))
@@ -951,8 +951,8 @@ class project extends control
die(js::locate($this->createLink('project', 'view', "projectID=$projectID"), 'parent'));
}
$this->view->header->title = $this->view->project->name . $this->lang->colon .$this->lang->project->delay;
$this->view->position[] = $this->lang->project->delay;
$this->view->header->title = $this->view->project->name . $this->lang->colon .$this->lang->project->putoff;
$this->view->position[] = $this->lang->project->putoff;
$this->display();
}

2
module/project/lang/en.php
View File

@@ -56,7 +56,7 @@ $lang->project->all = 'All';
$lang->project->start = 'Start';
$lang->project->activate = 'Activate';
$lang->project->delay = 'Delay';
$lang->project->putoff = 'Putoff';
$lang->project->suspend = 'Suspend';
$lang->project->close = 'Close';

2
module/project/lang/zh-cn.php
View File

@@ -56,7 +56,7 @@ $lang->project->all = '所有';
$lang->project->start = '开始';
$lang->project->activate = '激活';
$lang->project->delay = '延期';
$lang->project->putoff = '延期';
$lang->project->suspend = '挂起';
$lang->project->close = '结束';

6
module/project/model.php
View File

@@ -360,13 +360,13 @@ class projectModel extends model
}
/**
* Delay project.
* Put project off.
*
* @param int $projectID
* @access public
* @return void
*/
public function delay($projectID)
public function putoff($projectID)
{
$oldProject = $this->getById($projectID);
$now = helper::now();
@@ -1392,7 +1392,7 @@ class projectModel extends model
if($action == 'start') return $project->status == 'wait';
if($action == 'close') return $project->status != 'done';
if($action == 'suspend') return $project->status == 'wait' or $project->status == 'doing';
if($action == 'delay') return $project->status == 'wait' or $project->status == 'doing';
if($action == 'putoff') return $project->status == 'wait' or $project->status == 'doing';
if($action == 'activate') return $project->status == 'suspended' or $project->status == 'done';
return true;

0
module/project/view/delay.html.php → module/project/view/putoff.html.php
View File

2
module/project/view/view.html.php
View File

@@ -22,7 +22,7 @@
ob_start();
common::printIcon('project', 'start', "projectID=$project->id", $project);
common::printIcon('project', 'activate', "projectID=$project->id", $project);
common::printIcon('project', 'delay', "projectID=$project->id", $project);
common::printIcon('project', 'putoff', "projectID=$project->id", $project);
common::printIcon('project', 'suspend', "projectID=$project->id", $project);
common::printIcon('project', 'close', "projectID=$project->id", $project);