From e33a12ca87cc9f40c351bc92ebdc0092c2529cdd Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 29 Mar 2023 13:10:17 +0800 Subject: [PATCH 1/3] * Modify active style. --- module/api/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/api/control.php b/module/api/control.php index 48cacbbc6d..ce49b623d6 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -94,7 +94,7 @@ class api extends control $this->view->objectType = $objectType; $this->view->objectID = $objectID; $this->view->moduleID = $moduleID; - $this->view->libTree = $this->api->getLibTree($libID, $libs, $objectID); + $this->view->libTree = $this->api->getLibTree($libID, $libs, $moduleID); $this->view->users = $this->user->getPairs('noclosed,noletter'); $this->view->objectDropdown = isset($libs[$libID]) ? $this->generateLibsDropMenu($libs[$libID], $release) : ''; From 874f24bf14ff8cdb408bea73d1f81d0d1fb82d4a Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 29 Mar 2023 13:18:21 +0800 Subject: [PATCH 2/3] * Modify page style. --- module/api/css/common.css | 5 +++++ module/api/view/index.html.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/module/api/css/common.css b/module/api/css/common.css index 6dbf3b4d74..beb4a1b668 100644 --- a/module/api/css/common.css +++ b/module/api/css/common.css @@ -174,3 +174,8 @@ form .table-data, #content .table-data {border: 1px solid #e2e2e3;} .detail+.detail {border-top: 0px;} .menu-title {display: flex; align-items: center; justify-content: space-between;} .vision-drop.dropdown {padding-right: 35px;} + +#bysearchTab::before {display: none;} +#leftBar .selectBox #currentItem {width: 150px; display: flex; align-items: center;} +[lang^=zh] #leftBar .selectBox #currentItem {width: 180px;} +#leftBar .selectBox #currentItem > .text {overflow: hidden; text-align: left; flex: 0 1 100%;} diff --git a/module/api/view/index.html.php b/module/api/view/index.html.php index 1af000547b..9c868b4c5f 100644 --- a/module/api/view/index.html.php +++ b/module/api/view/index.html.php @@ -58,7 +58,7 @@
  • doc->libDropdown['addModule'];?>
  • -
  • ' data-toggle='modal' data-type='iframe'>api->libDropdown['editLib'];?>
  • +
  • ' data-toggle='modal' data-type='iframe'>doc->libDropdown['editLib'];?>
  • ' target='hiddenwin'>doc->libDropdown['deleteLib'];?>
  • From 70cd5599472a63cb35c8a39c3994dd0a5740c615 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 29 Mar 2023 13:19:52 +0800 Subject: [PATCH 3/3] * code for task #89159. --- module/doc/control.php | 3 ++- module/doc/model.php | 7 +++++++ module/doc/view/createtexttype.html.php | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/module/doc/control.php b/module/doc/control.php index 40f107feaa..cfbefa5c4d 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -405,7 +405,8 @@ class doc extends control } elseif($objectType == 'execution') { - $objects = $this->loadModel('execution')->getPairs(); + $execution = $this->loadModel('execution')->getById($objectID); + $objects = $this->execution->getPairs($execution->project, 'all', "multiple,leaf,noprefix"); } elseif($objectType == 'product') { diff --git a/module/doc/model.php b/module/doc/model.php index dde8bef4c4..4b99ff84bd 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2978,6 +2978,13 @@ class docModel extends model return $html; } + /** + * Get option menu for libs. + * + * @param array $libs + * @access public + * @return array + */ public function getLibsOptionMenu($libs) { $this->loadModel('tree'); diff --git a/module/doc/view/createtexttype.html.php b/module/doc/view/createtexttype.html.php index 43a683e968..b7c9377075 100644 --- a/module/doc/view/createtexttype.html.php +++ b/module/doc/view/createtexttype.html.php @@ -65,6 +65,11 @@ doc->execution?> doc->placeholder->execution}' onchange='loadObjectModules(\"execution\", this.value)'")?> + + + doc->execution;?> + + doc->product;?>