Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x
This commit is contained in:
@@ -1864,11 +1864,22 @@ class project extends control
|
||||
{
|
||||
if($confirm == 'no')
|
||||
{
|
||||
echo js::confirm(sprintf($this->lang->project->confirmDelete, $this->projects[$projectID]), $this->createLink('project', 'delete', "projectID=$projectID&confirm=yes"));
|
||||
/* Get the number of unfinished tasks and unresolved bugs. */
|
||||
$unfinishedTasks = $this->dao->select('COUNT(id) AS count')->from(TABLE_TASK)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->andWhere('status')->in('wait,doing')->fetch();
|
||||
$unresolvedBugs = $this->dao->select('COUNT(id) AS count')->from(TABLE_BUG)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->andWhere('status')->eq('active')->fetch();
|
||||
|
||||
/* Set prompt information. */
|
||||
$tips = '';
|
||||
if($unfinishedTasks->count) $tips = sprintf($this->lang->project->unfinishedTask, $unfinishedTasks->count);
|
||||
if($unresolvedBugs->count) $tips .= sprintf($this->lang->project->unresolvedBug, $unresolvedBugs->count);
|
||||
if($tips) $tips = $this->lang->project->unfinishedProject . $tips;
|
||||
|
||||
echo js::confirm($tips . sprintf($this->lang->project->confirmDelete, $this->projects[$projectID]), $this->createLink('project', 'delete', "projectID=$projectID&confirm=yes"));
|
||||
exit;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Delete project. */
|
||||
$this->project->delete(TABLE_PROJECT, $projectID);
|
||||
$this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('project')->eq($projectID)->exec();
|
||||
$this->project->updateUserView($projectID);
|
||||
|
||||
@@ -275,6 +275,9 @@ $lang->project->noweekend = 'Ohne Wochenende';
|
||||
$lang->project->withweekend = 'Mit Wochenende';
|
||||
$lang->project->interval = 'Intervale ';
|
||||
$lang->project->fixFirstWithLeft = 'Modify the left';
|
||||
$lang->project->unfinishedProject = "This {$lang->projectCommon} has ";
|
||||
$lang->project->unfinishedTask = "[%s] unfinished tasks. ";
|
||||
$lang->project->unresolvedBug = "[%s] unresolved bugs. ";
|
||||
|
||||
$lang->project->action = new stdclass();
|
||||
$lang->project->action->opened = '$date, created by <strong>$actor</strong> . $extra' . "\n";
|
||||
|
||||
@@ -275,6 +275,9 @@ $lang->project->noweekend = 'Exclude Weekend';
|
||||
$lang->project->withweekend = 'Include Weekend';
|
||||
$lang->project->interval = 'Intervals ';
|
||||
$lang->project->fixFirstWithLeft = 'Update hours left too';
|
||||
$lang->project->unfinishedProject = "This {$lang->projectCommon} has ";
|
||||
$lang->project->unfinishedTask = "[%s] unfinished tasks. ";
|
||||
$lang->project->unresolvedBug = "[%s] unresolved bugs. ";
|
||||
|
||||
$lang->project->action = new stdclass();
|
||||
$lang->project->action->opened = '$date, created by <strong>$actor</strong> . $extra' . "\n";
|
||||
|
||||
@@ -275,6 +275,9 @@ $lang->project->noweekend = 'Exclure les Weekends';
|
||||
$lang->project->withweekend = 'Inclure les Weekends';
|
||||
$lang->project->interval = 'Intervalles';
|
||||
$lang->project->fixFirstWithLeft = 'Mettre à jour les heures également';
|
||||
$lang->project->unfinishedProject = "This {$lang->projectCommon} has ";
|
||||
$lang->project->unfinishedTask = "[%s] unfinished tasks. ";
|
||||
$lang->project->unresolvedBug = "[%s] unresolved bugs. ";
|
||||
|
||||
$lang->project->action = new stdclass();
|
||||
$lang->project->action->opened = '$date, créée par <strong>$actor</strong> .' . "\n";
|
||||
|
||||
@@ -275,6 +275,9 @@ $lang->project->noweekend = 'Không gồm cuối tuần';
|
||||
$lang->project->withweekend = 'Bao gồm cuối tuần';
|
||||
$lang->project->interval = 'Intervals ';
|
||||
$lang->project->fixFirstWithLeft = 'Cập nhật cả giờ còn lại';
|
||||
$lang->project->unfinishedProject = "This {$lang->projectCommon} has ";
|
||||
$lang->project->unfinishedTask = "[%s] unfinished tasks. ";
|
||||
$lang->project->unresolvedBug = "[%s] unresolved bugs. ";
|
||||
|
||||
$lang->project->action = new stdclass();
|
||||
$lang->project->action->opened = '$date, được tạo bởi <strong>$actor</strong> $extra.' . "\n";
|
||||
|
||||
@@ -275,6 +275,9 @@ $lang->project->noweekend = '去除周末';
|
||||
$lang->project->withweekend = '显示周末';
|
||||
$lang->project->interval = '间隔';
|
||||
$lang->project->fixFirstWithLeft = '修改剩余工时';
|
||||
$lang->project->unfinishedProject = "该{$lang->projectCommon}下还有";
|
||||
$lang->project->unfinishedTask = "[%s]个未完成的任务,";
|
||||
$lang->project->unresolvedBug = "[%s]个未解决的bug,";
|
||||
|
||||
$lang->project->action = new stdclass();
|
||||
$lang->project->action->opened = '$date, 由 <strong>$actor</strong> 创建。$extra' . "\n";
|
||||
|
||||
Reference in New Issue
Block a user