diff --git a/module/doc/control.php b/module/doc/control.php index 44568f5ab8..c04a0759bf 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -1622,11 +1622,12 @@ class doc extends control $params = helper::safe64Decode($params); parse_str($params, $params); - $this->view->params = $params; + $this->view->params = $params; $this->view->objectType = $objectType; - $this->view->spaceList = $spaceList; - $this->view->typeList = $typeList; + $this->view->spaceList = $spaceList; + $this->view->typeList = $typeList; + $this->view->from = $from; $this->display(); } diff --git a/module/doc/js/selectlibtype.ui.js b/module/doc/js/selectlibtype.ui.js index b38d3d6f24..4239a9b0ae 100644 --- a/module/doc/js/selectlibtype.ui.js +++ b/module/doc/js/selectlibtype.ui.js @@ -12,7 +12,7 @@ window.getSpaceType = function() window.changeSpace = function() { const objectType = getSpaceType(); - if(objectType) loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}`)); + if(objectType) loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=&from=${pageFrom}`)); } /** @@ -28,7 +28,7 @@ window.reloadMineAndCustom = function() const libID = $('.modal-body input[name=lib]').val(); const params = window.btoa('objectID=' + objectID + '&libID=' + libID); - loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}`)); + loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}&from=${pageFrom}`)); } /** @@ -45,7 +45,7 @@ window.reloadProduct = function() const libID = $('.modal-body input[name=lib]').val(); const params = window.btoa('docType=' + docType + '&objectID=' + objectID + '&libID=' + libID); - loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}`)); + loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}&from=${pageFrom}`)); } /** @@ -63,7 +63,7 @@ window.reloadProject = function() const libID = $('.modal-body input[name=lib]').val(); const params = window.btoa('docType=' + docType + '&objectID=' + objectID + '&executionID=' + executionID + '&libID=' + libID); - loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}`)); + loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}&from=${pageFrom}`)); } /** @@ -77,7 +77,7 @@ window.reloadApiByApiType = function() const objectType = getSpaceType(); const apiType = $('.modal-body input[name=apiType]').val(); const params = window.btoa('apiType=' + apiType); - loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}`)); + loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}&from=${pageFrom}`)); } /** @@ -109,7 +109,7 @@ window.reloadApi = function() params = window.btoa('apiType=' + apiType + '&libID=' + libID); } - loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}`)); + loadModal($.createLink('doc', 'selectLibType', `objectType=${objectType}¶ms=${params}&from=${pageFrom}`)); } /** diff --git a/module/doc/ui/selectlibtype.html.php b/module/doc/ui/selectlibtype.html.php index 39a17fb23e..4df8409190 100644 --- a/module/doc/ui/selectlibtype.html.php +++ b/module/doc/ui/selectlibtype.html.php @@ -10,6 +10,8 @@ declare(strict_types=1); */ namespace zin; +jsVar('pageFrom', $from); + to::header ( entityLabel