From c7e4084d783f7054b0544760ca8704acbaec8a69 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 25 Jun 2021 09:12:36 +0800 Subject: [PATCH] * Batch import stories to lib. --- module/common/lang/de.php | 2 +- module/common/lang/en.php | 2 +- module/common/lang/fr.php | 4 +-- module/common/lang/vi.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/product/js/browse.js | 11 ++++++++ module/product/view/browse.html.php | 40 ++++++++++++++++++++++++++++- 7 files changed, 56 insertions(+), 7 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index fba68c28b3..c5b73b9d75 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -48,7 +48,6 @@ $lang->export = 'Exportieren'; $lang->setFileName = 'Dateiame'; $lang->submitting = 'Speichern...'; $lang->save = 'Speichern'; -$lang->saveSuccess = 'Gespeichert.'; $lang->confirm = 'Bestätigen'; $lang->preview = 'Ansehen'; $lang->goback = 'Zurück'; @@ -76,6 +75,7 @@ $lang->switchDisplay = 'Umschalten'; $lang->expand = 'Alle aufklappen'; $lang->collapse = 'Zuklappen'; $lang->saveSuccess = 'Gespeichert'; +$lang->importSuccess = 'Gespeichert'; $lang->fail = 'Fehlgeschlagen'; $lang->addFiles = 'Hinzufügen'; $lang->files = 'Datei '; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 3133e923dc..d1694e0587 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -53,7 +53,6 @@ $lang->export = 'Export'; $lang->setFileName = 'File Name'; $lang->submitting = 'Saving...'; $lang->save = 'Save'; -$lang->saveSuccess = 'Saved'; $lang->confirm = 'Confirm'; $lang->preview = 'View'; $lang->goback = 'Back'; @@ -81,6 +80,7 @@ $lang->switchDisplay = 'Toggle'; $lang->expand = 'Expand'; $lang->collapse = 'Collapse'; $lang->saveSuccess = 'Saved'; +$lang->importSuccess = 'Saved'; $lang->fail = 'Fail'; $lang->addFiles = 'Added Files'; $lang->files = 'Files '; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index d856773bcd..fac017b629 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -48,7 +48,6 @@ $lang->export = 'Exporter'; $lang->setFileName = 'Nom du Fichier'; $lang->submitting = 'Enregistrement...'; $lang->save = 'Sauvegarde'; -$lang->saveSuccess = 'Sauvegardé'; $lang->confirm = 'Confirmer'; $lang->preview = 'Consulter'; $lang->goback = 'Retour'; @@ -75,7 +74,8 @@ $lang->reverse = 'Inverser'; $lang->switchDisplay = 'Basculer'; $lang->expand = 'Déplier'; $lang->collapse = 'Replier'; -$lang->saveSuccess = 'Sauvé'; +$lang->saveSuccess = 'Sauvegardé'; +$lang->importSuccess = 'Sauvé'; $lang->fail = 'Echec'; $lang->addFiles = 'Fichiers ajoutés '; $lang->files = 'Fichiers '; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 7a25caa777..bebfed8d11 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -48,7 +48,6 @@ $lang->export = 'Xuất'; $lang->setFileName = 'File tên'; $lang->submitting = 'Đang lưu...'; $lang->save = 'Lưu lại'; -$lang->saveSuccess = 'Đã lưu'; $lang->confirm = 'Xác nhận'; $lang->preview = 'Xem'; $lang->goback = 'Trở lại'; @@ -76,6 +75,7 @@ $lang->switchDisplay = 'Menu'; $lang->expand = 'Mở ra'; $lang->collapse = 'Co lại'; $lang->saveSuccess = 'Đã lưu'; +$lang->importSuccess = 'Đã lưu'; $lang->fail = 'Thất bại'; $lang->addFiles = 'Tập tin đã thêm'; $lang->files = 'Files '; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 1d9e758089..fdd174e3fe 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -53,7 +53,6 @@ $lang->export = '导出'; $lang->setFileName = '文件名：'; $lang->submitting = '稍候...'; $lang->save = '保存'; -$lang->saveSuccess = '保存成功'; $lang->confirm = '确认'; $lang->preview = '查看'; $lang->goback = '返回'; @@ -81,6 +80,7 @@ $lang->switchDisplay = '切换显示'; $lang->expand = '展开全部'; $lang->collapse = '收起'; $lang->saveSuccess = '保存成功'; +$lang->importSuccess = '导入成功'; $lang->fail = '失败'; $lang->addFiles = '上传了附件 '; $lang->files = '附件 '; diff --git a/module/product/js/browse.js b/module/product/js/browse.js index fe86a31b9a..da8b236200 100644 --- a/module/product/js/browse.js +++ b/module/product/js/browse.js @@ -66,6 +66,17 @@ $(function() adjustTableFooter(); $('body').on('click', '#toggleFold', adjustTableFooter); $('body').on('click', '.icon.icon-angle-double-right', adjustTableFooter); + + /* Get checked stories. */ + $('#importToLib').on('click', function() + { + var storyIdList = ''; + $("input[name^='storyIdList']:checked").each(function() + { + storyIdList += $(this).val() + ','; + $('#storyIdList').val(storyIdList); + }); + }); }); /** diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index a4125a3e8d..dd9961087d 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -281,7 +281,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; $canBatchChangeModule = ($canBeChanged and common::hasPriv('story', 'batchChangeModule')); $canBatchChangePlan = ($canBeChanged and common::hasPriv('story', 'batchChangePlan')); $canBatchAssignTo = ($canBeChanged and common::hasPriv('story', 'batchAssignTo')); - $canBatchImportToLib = ($canBeChanged and $this->app->moduleName == 'projectstory' and isset($this->config->maxVersion) and common::hasPriv('story', 'batchImportToLib')); + $canBatchImportToLib = ($canBeChanged and $this->app->openApp == 'project' and isset($this->config->maxVersion) and common::hasPriv('story', 'batchImportToLib')); $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchImportToLib); ?> @@ -518,6 +518,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; + story->importToLib, '', 'class="btn" data-toggle="modal" id="importToLib"');?>
@@ -543,6 +544,43 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; + +