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

* Change function name for getBudgetWithUnit.

Browse Source
This commit is contained in:
zhengrunyu
2022-04-12 09:53:30 +08:00
parent 73642794a1
commit 7d3a91ab39
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/v1/entries/bugclose.php
View File

@@ -34,7 +34,7 @@ class bugCloseEntry extends Entry
$bug = $this->bug->getByID($bugID);
$this->send(200, $this->format($bug, 'assignedTo:user,assignedDate:time,lastEditedBy:user,lastEditedDate:time,closedBy:user,closedDate:time'));
$this->send(200, $this->format($bug, 'openedBy:user,openedDate:time,assignedTo:user,assignedDate:time,reviewedBy:user,reviewedDate:time,lastEditedBy:user,lastEditedDate:time,closedBy:user,closedDate:time,deleted:bool,mailto:userList'));
}
}

2
api/v1/entries/bugconfirm.php
View File

@@ -34,7 +34,7 @@ class bugConfirmEntry extends Entry
$bug = $this->bug->getById($bugID);
$this->send(200, $this->format($bug, 'assignedTo:user,assignedDate:time,lastEditedBy:user,lastEditedDate:time,mailto:userList'));
$this->send(200, $this->format($bug, 'openedBy:user,openedDate:time,assignedTo:user,assignedDate:time,reviewedBy:user,reviewedDate:time,lastEditedBy:user,lastEditedDate:time,closedBy:user,closedDate:time,deleted:bool,mailto:userList'));
}
}

2
api/v1/entries/programs.php
View File

@@ -48,7 +48,7 @@ class programsEntry extends Entry
unset($program->desc);
$program->end = $program->end == LONG_TIME ? $this->lang->program->longTime : $program->end;
$programBudget = $this->loadModel('project')->budgetUnit($program->budget);
$programBudget = $this->loadModel('project')->getBudgetWithUnit($program->budget);
$program->labelBudget = $program->budget != 0 ? zget($this->lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $this->lang->project->future;
if(empty($program->parent)) $result[$program->id] = $program;

2
module/program/view/browsebylist.html.php
View File

@@ -72,7 +72,7 @@
<?php echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'");?>
<?php endif;?>
</td>
<?php $programBudget = $this->loadModel('project')->budgetUnit($program->budget);?>
<?php $programBudget = $this->loadModel('project')->getBudgetWithUnit($program->budget);?>
<td class='text-right'><?php echo $program->budget != 0 ? zget($lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $lang->project->future;?></td>
<td><?php echo $program->begin;?></td>
<td><?php echo $program->end == LONG_TIME ? $lang->program->longTime : $program->end;?></td>

6
module/project/model.php
View File

@@ -1659,7 +1659,7 @@ class projectModel extends model
if($id == 'budget')
{
$projectBudget = $this->budgetUnit($project->budget);
$projectBudget = $this->getBudgetWithUnit($project->budget);
$budgetTitle = $project->budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future;
$title = "title='$budgetTitle'";
@@ -1789,13 +1789,13 @@ class projectModel extends model
}
/**
* Conversion budget unit
* Convert budget unit.
*
* @param int $budget
* @access public
* @return void
*/
public function budgetUnit($budget)
public function getBudgetWithUnit($budget)
{
if($budget < 10000)
{