From a32037a41718a0fd7a8cc45b053fea97b9cd37e8 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 14 May 2024 10:51:37 +0800 Subject: [PATCH] * Fix bug #49302,49163. --- module/doc/ui/view.html.php | 68 +++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/module/doc/ui/view.html.php b/module/doc/ui/view.html.php index 19714654d8..1b576a94c9 100644 --- a/module/doc/ui/view.html.php +++ b/module/doc/ui/view.html.php @@ -59,8 +59,8 @@ if($config->vision == 'rnd' and ($config->edition == 'max' or $config->edition = $canImportToPracticeLib = (common::hasPriv('doc', 'importToPracticeLib') and helper::hasFeature('practicelib')); $canImportToComponentLib = (common::hasPriv('doc', 'importToComponentLib') and helper::hasFeature('componentlib')); - if($canImportToPracticeLib) $items[] = array('text' => $lang->doc->importToPracticeLib, 'url' => '#importToPracticeLib', 'data-toggle' => 'modal'); - if($canImportToComponentLib) $items[] = array('text' => $lang->doc->importToComponentLib, 'url' => '#importToComponentLib', 'data-toggle' => 'modal'); + if($canImportToPracticeLib) $items[] = array('text' => $lang->doc->importToPracticeLib, 'url' => '#importToPracticeLib', 'data-toggle' => 'modal', 'data-size' => 'sm'); + if($canImportToComponentLib) $items[] = array('text' => $lang->doc->importToComponentLib, 'url' => '#importToComponentLib', 'data-toggle' => 'modal', 'data-size' => 'sm'); $importLibBtn = $items ? dropdown ( @@ -290,3 +290,67 @@ panel $historyDom ) ); + +modal +( + setID('importToPracticeLib'), + formPanel + ( + set::title($lang->doc->importToPracticeLib), + set::actions(array('submit')), + set::submitBtnText($lang->export), + set::url(createLink('doc', 'importToPracticeLib', "doc={$doc->id}")), + set::formClass('mt-6'), + formGroup + ( + set::label($lang->doc->practiceLib), + setID('practiceLib'), + set::name('lib'), + set::items($practiceLibs), + set::required(true) + ), + !common::hasPriv('assetlib', 'approvePractice') && !common::hasPriv('assetlib', 'batchApprovePractice') ? formGroup + ( + set::label($lang->doc->approver), + picker + ( + setID('practiceApprover'), + set::name('assignedTo'), + set::items($practiceApprovers), + set::required(true) + ) + ) : null + ) +); + +modal +( + setID('importToComponentLib'), + formPanel + ( + set::title($lang->doc->importToComponentLib), + set::actions(array('submit')), + set::submitBtnText($lang->export), + set::url(createLink('doc', 'importToComponentLib', "doc={$doc->id}")), + set::formClass('mt-6'), + formGroup + ( + set::label($lang->doc->componentLib), + setID('componentLib'), + set::name('lib'), + set::items($componentLibs), + set::required(true) + ), + !common::hasPriv('assetlib', 'approveComponent') && !common::hasPriv('assetlib', 'batchApproveComponent') ? formGroup + ( + set::label($lang->doc->approver), + picker + ( + setID('componentApprover'), + set::name('assignedTo'), + set::items($componentApprovers), + set::required(true) + ) + ) : null + ) +);