Merge branch dev/story-74960 of zentao/zentaopms (#8887)
This commit is contained in:
刘刚
@@ -206,6 +206,31 @@ class action extends control
|
||||
$url = $this->createLink('action', 'trash', "browseType=boardspace");
|
||||
if($isDeleted) return $this->send(array('result' => 'fail', 'callback' => "zui.Modal.confirm({message: '{$this->lang->action->undeleteBoardTip}'}).then((res) => {if(res) loadPage('{$url}');});"));
|
||||
}
|
||||
elseif($oldAction->objectType == 'doctemplate')
|
||||
{
|
||||
$templateScopeAndType = $this->dao->select('id,lib,module')->from(TABLE_DOC)->where('id')->eq($oldAction->objectID)->fetchAll('id');
|
||||
$scopeID = zget($templateScopeAndType[$oldAction->objectID], 'lib', 0);
|
||||
$typeID = zget($templateScopeAndType[$oldAction->objectID], 'module', 0);
|
||||
if($confirmChange == 'no')
|
||||
{
|
||||
$isDeletedType = $this->dao->select('deleted')->from(TABLE_MODULE)->where('type')->eq('docTemplate')->andWhere('id')->eq($typeID)->fetch('deleted');
|
||||
$isDeletedScope = $this->dao->select('deleted')->from(TABLE_DOCLIB)->where('type')->eq('template')->andWhere('id')->eq($scopeID)->fetch('deleted');
|
||||
|
||||
if($isDeletedType == '1' || $isDeletedScope == '1')
|
||||
{
|
||||
$url = $this->createLink('action', 'undelete', "action={$actionID}&browseType={$browseType}&confirmChange=yes");
|
||||
return $this->send(array('result' => 'fail', 'callback' => "zui.Modal.confirm({message: '{$this->lang->action->undeleteTemplateTip}', icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) => {if(res) $.ajaxSubmit({url: '{$url}'});});"));
|
||||
}
|
||||
}
|
||||
|
||||
if($confirmChange == 'yes')
|
||||
{
|
||||
$this->dao->update(TABLE_DOCLIB)->set('deleted')->eq('0')->where('id')->eq($scopeID)->exec();
|
||||
$this->dao->update(TABLE_MODULE)->set('deleted')->eq('0')->where('id')->eq($typeID)->exec();
|
||||
$parentType = $this->dao->select('parent')->from(TABLE_MODULE)->where('id')->eq($typeID)->fetch('parent');
|
||||
if(!empty($parentType)) $this->dao->update(TABLE_MODULE)->set('deleted')->eq('0')->where('id')->eq($parentType)->exec();
|
||||
}
|
||||
}
|
||||
|
||||
$result = $this->action->undelete($actionID);
|
||||
if(true !== $result) return $this->send(array('result' => 'fail', 'load' => array('confirm' => $result)));
|
||||
|
||||
+18
-17
@@ -58,23 +58,24 @@ $lang->action->refusescene = 'Before restoring the scene, please restore the pa
|
||||
$lang->action->refusemodule = 'Before restoring the module, please restore the parent module of this module ';
|
||||
$lang->action->refusekanban = 'Before restoring the Kanban board, make sure to restore the space it belongs to';
|
||||
|
||||
$lang->action->trashTips = 'Hinweis: Alle Löschungen in ZenTao sind logische Löschungen.';
|
||||
$lang->action->textDiff = 'Text Format';
|
||||
$lang->action->original = 'Original Format';
|
||||
$lang->action->confirmHideAll = 'Möchten Sie alle Einträge verstecken?';
|
||||
$lang->action->needEdit = '%s existiert bereits. Bitte bearbeiten.';
|
||||
$lang->action->historyEdit = 'Der Verlauf darf nicht leer sein.';
|
||||
$lang->action->noDynamic = 'Kein Verlauf. ';
|
||||
$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
|
||||
$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
|
||||
$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
|
||||
$lang->action->hasCreatedTask = 'Tasks have been created in this parent phase and cannot be restored!';
|
||||
$lang->action->hasDeletedParent = 'Restoring this phase requires restoring the deleted parent phase %s at the same time.';
|
||||
$lang->action->hasChangedAttr = "After recovery, the phase type will be adjusted to '%s' according to the parent phase type.";
|
||||
$lang->action->whetherToRestore = 'Confirm to restore?';
|
||||
$lang->action->undeleteModuleTip = 'Once the subdirectory has been restored, its parent directory will also be automatically recovered and synchronized, would you like to proceed with restoring the directory?';
|
||||
$lang->action->undeleteTaskTip = 'The execution associated with this task has been removed. If you choose to restore it, the task will no longer be visible. Would you like to proceed with restoring the task?';
|
||||
$lang->action->undeleteBoardTip = 'Before restoring the board, please restore its affiliated space first.';
|
||||
$lang->action->trashTips = 'Hinweis: Alle Löschungen in ZenTao sind logische Löschungen.';
|
||||
$lang->action->textDiff = 'Text Format';
|
||||
$lang->action->original = 'Original Format';
|
||||
$lang->action->confirmHideAll = 'Möchten Sie alle Einträge verstecken?';
|
||||
$lang->action->needEdit = '%s existiert bereits. Bitte bearbeiten.';
|
||||
$lang->action->historyEdit = 'Der Verlauf darf nicht leer sein.';
|
||||
$lang->action->noDynamic = 'Kein Verlauf. ';
|
||||
$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
|
||||
$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
|
||||
$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
|
||||
$lang->action->hasCreatedTask = 'Tasks have been created in this parent phase and cannot be restored!';
|
||||
$lang->action->hasDeletedParent = 'Restoring this phase requires restoring the deleted parent phase %s at the same time.';
|
||||
$lang->action->hasChangedAttr = "After recovery, the phase type will be adjusted to '%s' according to the parent phase type.";
|
||||
$lang->action->whetherToRestore = 'Confirm to restore?';
|
||||
$lang->action->undeleteModuleTip = 'Once the subdirectory has been restored, its parent directory will also be automatically recovered and synchronized, would you like to proceed with restoring the directory?';
|
||||
$lang->action->undeleteTaskTip = 'The execution associated with this task has been removed. If you choose to restore it, the task will no longer be visible. Would you like to proceed with restoring the task?';
|
||||
$lang->action->undeleteBoardTip = 'Before restoring the board, please restore its affiliated space first.';
|
||||
$lang->action->undeleteTemplateTip = 'The type (and scope) of this template has been deleted. Are you sure you want to synchronize and restore them?';
|
||||
|
||||
$lang->action->hasOtherType = array();
|
||||
$lang->action->hasOtherType['stage'] = "Only subtypes of {$lang->executionCommon} / Kanban types can be created at this parent stage, so the current stage cannot be restored.";
|
||||
|
||||
+18
-17
@@ -58,23 +58,24 @@ $lang->action->refusescene = 'Before restoring the scene, please restore the pa
|
||||
$lang->action->refusemodule = 'Before restoring the module, please restore the parent module of this module ';
|
||||
$lang->action->refusekanban = 'Before restoring the Kanban board, make sure to restore the space it belongs to';
|
||||
|
||||
$lang->action->trashTips = 'Note: Delete in ZenTao is logic.';
|
||||
$lang->action->textDiff = 'Text Format';
|
||||
$lang->action->original = 'Original Format';
|
||||
$lang->action->confirmHideAll = 'Do you want to hide all the records?';
|
||||
$lang->action->needEdit = '%s that you want to restore. Please edit it.';
|
||||
$lang->action->historyEdit = 'The history EditBy cannot be empty.';
|
||||
$lang->action->noDynamic = 'No dynamics. ';
|
||||
$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
|
||||
$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
|
||||
$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
|
||||
$lang->action->hasCreatedTask = 'Tasks have been created in this parent phase and cannot be restored!';
|
||||
$lang->action->hasDeletedParent = 'Restoring this phase requires restoring the deleted parent phase %s at the same time.';
|
||||
$lang->action->hasChangedAttr = "After recovery, the phase type will be adjusted to '%s' according to the parent phase type.";
|
||||
$lang->action->whetherToRestore = 'Confirm to restore?';
|
||||
$lang->action->undeleteModuleTip = 'Once the subdirectory has been restored, its parent directory will also be automatically recovered and synchronized, would you like to proceed with restoring the directory?';
|
||||
$lang->action->undeleteTaskTip = 'The execution associated with this task has been removed. If you choose to restore it, the task will no longer be visible. Would you like to proceed with restoring the task?';
|
||||
$lang->action->undeleteBoardTip = 'Before restoring the board, please restore its affiliated space first.';
|
||||
$lang->action->trashTips = 'Note: Delete in ZenTao is logic.';
|
||||
$lang->action->textDiff = 'Text Format';
|
||||
$lang->action->original = 'Original Format';
|
||||
$lang->action->confirmHideAll = 'Do you want to hide all the records?';
|
||||
$lang->action->needEdit = '%s that you want to restore. Please edit it.';
|
||||
$lang->action->historyEdit = 'The history EditBy cannot be empty.';
|
||||
$lang->action->noDynamic = 'No dynamics. ';
|
||||
$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
|
||||
$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
|
||||
$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
|
||||
$lang->action->hasCreatedTask = 'Tasks have been created in this parent phase and cannot be restored!';
|
||||
$lang->action->hasDeletedParent = 'Restoring this phase requires restoring the deleted parent phase %s at the same time.';
|
||||
$lang->action->hasChangedAttr = "After recovery, the phase type will be adjusted to '%s' according to the parent phase type.";
|
||||
$lang->action->whetherToRestore = 'Confirm to restore?';
|
||||
$lang->action->undeleteModuleTip = 'Once the subdirectory has been restored, its parent directory will also be automatically recovered and synchronized, would you like to proceed with restoring the directory?';
|
||||
$lang->action->undeleteTaskTip = 'The execution associated with this task has been removed. If you choose to restore it, the task will no longer be visible. Would you like to proceed with restoring the task?';
|
||||
$lang->action->undeleteBoardTip = 'Before restoring the board, please restore its affiliated space first.';
|
||||
$lang->action->undeleteTemplateTip = 'The type (and scope) of this template has been deleted. Are you sure you want to synchronize and restore them?';
|
||||
|
||||
$lang->action->hasOtherType = array();
|
||||
$lang->action->hasOtherType['stage'] = "Only subtypes of {$lang->executionCommon} / Kanban types can be created at this parent stage, so the current stage cannot be restored.";
|
||||
|
||||
+18
-17
@@ -58,23 +58,24 @@ $lang->action->refusescene = 'Before restoring the scene, please restore the pa
|
||||
$lang->action->refusemodule = 'Before restoring the module, please restore the parent module of this module ';
|
||||
$lang->action->refusekanban = 'Before restoring the Kanban board, make sure to restore the space it belongs to';
|
||||
|
||||
$lang->action->trashTips = 'Note: Les suppressions dans ZenTao sont purement logiques.';
|
||||
$lang->action->textDiff = 'Text Format';
|
||||
$lang->action->original = 'Original Format';
|
||||
$lang->action->confirmHideAll = 'Voulez-vous masquer tous les enregistrements ?';
|
||||
$lang->action->needEdit = '%s que vous voulez restaurer. SVP éditez la.';
|
||||
$lang->action->historyEdit = "l'historique Edité Par ne peut pas être vide.";
|
||||
$lang->action->noDynamic = "Pas d'historique.";
|
||||
$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
|
||||
$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
|
||||
$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
|
||||
$lang->action->hasCreatedTask = 'Tasks have been created in this parent phase and cannot be restored!';
|
||||
$lang->action->hasDeletedParent = 'Restoring this phase requires restoring the deleted parent phase %s at the same time.';
|
||||
$lang->action->hasChangedAttr = "After recovery, the phase type will be adjusted to '%s' according to the parent phase type.";
|
||||
$lang->action->whetherToRestore = 'Confirm to restore?';
|
||||
$lang->action->undeleteModuleTip = 'Once the subdirectory has been restored, its parent directory will also be automatically recovered and synchronized, would you like to proceed with restoring the directory?';
|
||||
$lang->action->undeleteTaskTip = 'The execution associated with this task has been removed. If you choose to restore it, the task will no longer be visible. Would you like to proceed with restoring the task?';
|
||||
$lang->action->undeleteBoardTip = 'Before restoring the board, please restore its affiliated space first.';
|
||||
$lang->action->trashTips = 'Note: Les suppressions dans ZenTao sont purement logiques.';
|
||||
$lang->action->textDiff = 'Text Format';
|
||||
$lang->action->original = 'Original Format';
|
||||
$lang->action->confirmHideAll = 'Voulez-vous masquer tous les enregistrements ?';
|
||||
$lang->action->needEdit = '%s que vous voulez restaurer. SVP éditez la.';
|
||||
$lang->action->historyEdit = "l'historique Edité Par ne peut pas être vide.";
|
||||
$lang->action->noDynamic = "Pas d'historique.";
|
||||
$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
|
||||
$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
|
||||
$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
|
||||
$lang->action->hasCreatedTask = 'Tasks have been created in this parent phase and cannot be restored!';
|
||||
$lang->action->hasDeletedParent = 'Restoring this phase requires restoring the deleted parent phase %s at the same time.';
|
||||
$lang->action->hasChangedAttr = "After recovery, the phase type will be adjusted to '%s' according to the parent phase type.";
|
||||
$lang->action->whetherToRestore = 'Confirm to restore?';
|
||||
$lang->action->undeleteModuleTip = 'Once the subdirectory has been restored, its parent directory will also be automatically recovered and synchronized, would you like to proceed with restoring the directory?';
|
||||
$lang->action->undeleteTaskTip = 'The execution associated with this task has been removed. If you choose to restore it, the task will no longer be visible. Would you like to proceed with restoring the task?';
|
||||
$lang->action->undeleteBoardTip = 'Before restoring the board, please restore its affiliated space first.';
|
||||
$lang->action->undeleteTemplateTip = 'The type (and scope) of this template has been deleted. Are you sure you want to synchronize and restore them?';
|
||||
|
||||
$lang->action->hasOtherType = array();
|
||||
$lang->action->hasOtherType['stage'] = "Only subtypes of {$lang->executionCommon} / Kanban types can be created at this parent stage, so the current stage cannot be restored.";
|
||||
|
||||
@@ -58,23 +58,24 @@ $lang->action->refusescene = '还原场景之前，请先还原该场景的父
|
||||
$lang->action->refusemodule = '还原模块之前，请先还原该模块的父模块';
|
||||
$lang->action->refusekanban = '还原看板之前，请先还原该看板所属空间';
|
||||
|
||||
$lang->action->trashTips = '提示：为了保证系统的完整性，禅道系统的删除都是标记删除。';
|
||||
$lang->action->textDiff = '文本格式';
|
||||
$lang->action->original = '原始格式';
|
||||
$lang->action->confirmHideAll = '您确定要全部隐藏这些记录吗？';
|
||||
$lang->action->needEdit = '要还原%s的名称或代号已经存在，请编辑更改。';
|
||||
$lang->action->historyEdit = '历史记录编辑不能为空。';
|
||||
$lang->action->noDynamic = '暂时没有动态。';
|
||||
$lang->action->undeletedTips = '该数据在版本升级过程中未参与数据归并流程，不支持还原。';
|
||||
$lang->action->executionNoProject = "该执行没有所属的{$lang->projectCommon}，请先还原{$lang->projectCommon}再还原执行";
|
||||
$lang->action->repoNoServer = '该代码库没有所属的服务器，请先还原服务器再还原代码库';
|
||||
$lang->action->hasCreatedTask = '该父阶段已创建任务，无法恢复！';
|
||||
$lang->action->hasDeletedParent = '恢复该阶段需要同时恢复已删除的父阶段%s，';
|
||||
$lang->action->hasChangedAttr = '恢复后阶段类型将根据父阶段类型均调整为“%s”，';
|
||||
$lang->action->whetherToRestore = '是否恢复？';
|
||||
$lang->action->undeleteModuleTip = '子目录恢复后，会同步恢复他的上级目录，确认要恢复吗？';
|
||||
$lang->action->undeleteTaskTip = '该任务所属执行已删除，还原后不能看到该任务，是否继续还原任务？';
|
||||
$lang->action->undeleteBoardTip = '还原白板之前，请先还原该白板的所属空间。';
|
||||
$lang->action->trashTips = '提示：为了保证系统的完整性，禅道系统的删除都是标记删除。';
|
||||
$lang->action->textDiff = '文本格式';
|
||||
$lang->action->original = '原始格式';
|
||||
$lang->action->confirmHideAll = '您确定要全部隐藏这些记录吗？';
|
||||
$lang->action->needEdit = '要还原%s的名称或代号已经存在，请编辑更改。';
|
||||
$lang->action->historyEdit = '历史记录编辑不能为空。';
|
||||
$lang->action->noDynamic = '暂时没有动态。';
|
||||
$lang->action->undeletedTips = '该数据在版本升级过程中未参与数据归并流程，不支持还原。';
|
||||
$lang->action->executionNoProject = "该执行没有所属的{$lang->projectCommon}，请先还原{$lang->projectCommon}再还原执行";
|
||||
$lang->action->repoNoServer = '该代码库没有所属的服务器，请先还原服务器再还原代码库';
|
||||
$lang->action->hasCreatedTask = '该父阶段已创建任务，无法恢复！';
|
||||
$lang->action->hasDeletedParent = '恢复该阶段需要同时恢复已删除的父阶段%s，';
|
||||
$lang->action->hasChangedAttr = '恢复后阶段类型将根据父阶段类型均调整为“%s”，';
|
||||
$lang->action->whetherToRestore = '是否恢复？';
|
||||
$lang->action->undeleteModuleTip = '子目录恢复后，会同步恢复他的上级目录，确认要恢复吗？';
|
||||
$lang->action->undeleteTaskTip = '该任务所属执行已删除，还原后不能看到该任务，是否继续还原任务？';
|
||||
$lang->action->undeleteBoardTip = '还原白板之前，请先还原该白板的所属空间。';
|
||||
$lang->action->undeleteTemplateTip = '该文档模板的类型（和范围）已被删除，确认要同步还原吗？';
|
||||
|
||||
$lang->action->hasOtherType = array();
|
||||
$lang->action->hasOtherType['stage'] = "当前阶段的父级现在只允许创建{$lang->executionCommon}/看板类型的子级,故无法恢复当前阶段。";
|
||||
|
||||
Reference in New Issue
Block a user