diff --git a/lib/zin/wg/docapp/js/v1.js b/lib/zin/wg/docapp/js/v1.js index 0e9e4da5d2..38fb181a6e 100644 --- a/lib/zin/wg/docapp/js/v1.js +++ b/lib/zin/wg/docapp/js/v1.js @@ -9,33 +9,16 @@ let docLangData = null; let docBasicModal = {}; const savingDocData = {}; -window.setZentaoSlashMenu = function(menus, title, vision, position, projectReviewTemplates) +window.setZentaoSlashMenu = function(menus, title, vision, position) { if(vision == 'or' || vision == 'lite') return; if(!menus?.length) return; - const reviewObjects = ['PP', 'SRS', 'HLDS', 'DDS', 'DBDS', 'ADS', 'ITTC', 'STTC']; const slashMenus = menus.map(menu => { - menu.showWhen = function(context) { - const doc = getDocApp().doc; - const docID = doc.data.id; - const templateType = doc.data.templateType; - if(reviewObjects.includes(templateType) && projectReviewTemplates?.[templateType]?.[docID]) return menu.reviewObject !== undefined && menu.reviewObject.indexOf(templateType) !== -1; - return true; - } - if(menu.subMenu) { menu.subMenu = menu.subMenu.map(subMenu => { - subMenu.showWhen = function(context) { - const doc = getDocApp().doc; - const docID = doc.data.id; - const templateType = doc.data.templateType; - if(reviewObjects.includes(templateType) && projectReviewTemplates?.[templateType]?.[docID]) return subMenu.reviewObject !== undefined && subMenu.reviewObject.indexOf(templateType) !== -1; - return true; - } - subMenu.action = function (context) { zui.Modal.open({ size: subMenu.modalSize ? subMenu.modalSize : 'lg', diff --git a/lib/zin/wg/docapp/v1.php b/lib/zin/wg/docapp/v1.php index e5ac8f962d..f37e7051cd 100644 --- a/lib/zin/wg/docapp/v1.php +++ b/lib/zin/wg/docapp/v1.php @@ -277,8 +277,6 @@ class docApp extends wg $historyPanelProps = array('fileListProps' => $fileListProps); $canPreviewOffice = $canDownload && isset($config->file->libreOfficeTurnon) and $config->file->libreOfficeTurnon == 1; - $projectReviewTemplates = $this->prop('projectReviewTemplates') ? $this->prop('projectReviewTemplates') : array(); - return zui::docApp ( set::_class('shadow rounded ring canvas'), @@ -324,7 +322,7 @@ class docApp extends wg set::showToolbar(true), set::canPreviewOffice($canPreviewOffice), set::fileInfoUrl($fileInfoUrl), - $hasZentaoSlashMenu ? jsCall('setZentaoSlashMenu', $this->getZentaoListMenu(), $lang->doc->zentaoData, $config->vision, $config->doc->zentaoListMenuPosition, $projectReviewTemplates) : null + $hasZentaoSlashMenu ? jsCall('setZentaoSlashMenu', $this->getZentaoListMenu(), $lang->doc->zentaoData, $config->vision, $config->doc->zentaoListMenuPosition) : null ); } } diff --git a/module/doc/ui/templatelist.html.php b/module/doc/ui/templatelist.html.php index 9d8174a2f3..53c1c8affc 100644 --- a/module/doc/ui/templatelist.html.php +++ b/module/doc/ui/templatelist.html.php @@ -112,8 +112,7 @@ docApp set::pager(array('recTotal' => count($templateList), 'recPerPage' => $recPerPage, 'page' => $pageID)), set('$options', jsRaw('window.setDocAppOptions')), set::showDocOutline(false), - set::hasModules($hasModules), - set::projectReviewTemplates($projectReviewTemplates) + set::hasModules($hasModules) ); render();