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

* Adjust code.

Browse Source
This commit is contained in:
leiyong
2020-12-18 16:18:41 +08:00
parent 8fc7117fb6
commit 8089ffe9a6
4 changed files with 21 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
-2
View File
@@ -689,12 +689,10 @@ $lang->resource->programplan = new stdclass();
$lang->resource->programplan->browse = 'browse';
$lang->resource->programplan->create = 'create';
$lang->resource->programplan->edit = 'edit';
$lang->resource->programplan->delete = 'delete';
$lang->programplan->methodOrder[5] = 'browse';
$lang->programplan->methodOrder[10] = 'create';
$lang->programplan->methodOrder[15] = 'edit';
$lang->programplan->methodOrder[20] = 'delete';
/* Task. */
$lang->resource->task = new stdclass();
module/product/model.php
+2
View File
@@ -1405,6 +1405,8 @@ class productModel extends model
*/
public function replaceStoryConcept($productID = 0)
{
if($this->cookie->lastProduct) return false;
$this->loadModel('custom');
$product = $this->getByID($productID);
$lastProduct = $this->getByID($this->cookie->lastProduct);
module/programplan/control.php
+2 -29
View File
@@ -152,10 +152,11 @@ class programplan extends control
if($_POST)
{
$changes = $this->programplan->update($planID, $projectID);
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
if($changes)
{
$actionID = $this->loadModel('action')->create('programplan', $planID, 'edited');
$actionID = $this->loadModel('action')->create('execution', $planID, 'edited');
$this->action->logHistory($actionID, $changes);
}
$locate = isonlybody() ? 'parent' : inlink('browse', "program=$plan->program&type=lists");
@@ -172,34 +173,6 @@ class programplan extends control
$this->display();
}
/**
* Delete a project plan.
*
* @param int $planID
* @param string $confirm
* @access public
* @return void
*/
public function delete($planID, $confirm = 'no')
{
if($confirm == 'no')
{
die(js::confirm($this->lang->programplan->confirmDelete, $this->createLink('programplan', 'delete', "planID=$planID&confirm=yes")));
}
else
{
$response['result'] = 'success';
$response['message'] = '';
$this->programplan->delete(TABLE_PROJECT, $planID);
if(dao::isError())
{
$response['result'] = 'fail';
$response['message'] = dao::getError();
}
$this->send($response);
}
}
/**
* Save custom settings via ajax.
*
module/programplan/model.php
+17 -10
View File
@@ -470,6 +470,7 @@ class programplanModel extends model
if($totalPercent > 100) return dao::$errors['message'][] = $this->lang->programplan->error->percentOver;
$this->loadModel('action');
$this->loadModel('user');
$this->loadModel('project');
$this->app->loadLang('doc');
@@ -485,27 +486,27 @@ class programplanModel extends model
$data->days = helper::diffDate($data->end, $data->begin) + 1;
if($data->id)
{
$planID = $data->id;
$stageID = $data->id;
unset($data->id);
$oldPlan = $this->getByID($planID);
$planChanged = ($oldPlan->name != $data->name || $oldPlan->milestone != $data->milestone || $oldPlan->begin != $data->begin || $oldPlan->end != $data->end);
$oldStage = $this->getByID($stageID);
$planChanged = ($oldStage->name != $data->name || $oldStage->milestone != $data->milestone || $oldStage->begin != $data->begin || $oldStage->end != $data->end);
if($planChanged) $data->version = $oldPlan->version + 1;
if($planChanged) $data->version = $oldStage->version + 1;
$this->dao->update(TABLE_PROJECT)->data($data)
->autoCheck()
->batchCheck($this->config->programplan->edit->requiredFields, 'notempty')
->checkIF($plan->percent != '', 'percent', 'float')
->where('id')->eq($planID)
->where('id')->eq($stageID)
->exec();
if($data->acl != 'open') $this->user->updateUserView($planID, 'sprint');
if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
/* Record version change information. */
if($planChanged)
{
$spec = new stdclass();
$spec->project = $planID;
$spec->project = $stageID;
$spec->version = $data->version;
$spec->name = $data->name;
$spec->milestone = $data->milestone;
@@ -513,6 +514,10 @@ class programplanModel extends model
$spec->end = $data->end;
$this->dao->insert(TABLE_PROJECTSPEC)->data($spec)->exec();
}
$changes = common::createChanges($oldStage, $data);
$actionID = $this->action->create('execution', $stageID, 'edited');
$this->action->logHistory($actionID, $changes);
}
else
{
@@ -574,6 +579,8 @@ class programplanModel extends model
$spec->begin = $data->begin;
$spec->end = $data->end;
$this->dao->insert(TABLE_PROJECTSPEC)->data($spec)->exec();
$this->action->create('execution', $stageID, 'opened', '', join(',', $_POST['products']));
}
}
@@ -801,11 +808,11 @@ class programplanModel extends model
}
common::printIcon('programplan', 'edit', "planID=$plan->id&projectID=$projectID", $plan, 'list', '', '', 'iframe', true);
$disabled = !empty($plan->children) ? ' disabled' : '';
if(common::hasPriv('programplan', 'delete', $plan))
if(common::hasPriv('project', 'delete', $plan))
{
$deleteURL = helper::createLink('programplan', 'delete', "planID=$plan->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"programplanForm\", confirmDelete)", '<i class="icon icon-close"></i>', '', "title='{$this->lang->programplan->delete}' class='btn $disabled'");
common::printIcon('project', 'delete', "planID=$plan->id&confirm=no", $plan, 'list', 'trash', 'hiddenwin' , $disabled);
}
break;
}