Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/193_hufangzhou_54985' into 'master'

Browse Source 
* Finish task #54985.

See merge request easycorp/zentaopms!3565
This commit is contained in:
王怡栋
2022-05-24 09:20:24 +00:00
parent d6013819ab 79f28c9cb2
commit b54de18d66
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+8 -11
View File
@@ -250,17 +250,18 @@ class doc extends control
*
* @param int $libID
* @param string $confirm yes|no
* @param string $from lib|book
* @param string $type lib|book
* @param string $from tableContents|objectLibs
* @access public
* @return void
*/
public function deleteLib($libID, $confirm = 'no', $from = 'lib')
public function deleteLib($libID, $confirm = 'no', $type = 'lib', $from = 'objectLibs')
{
if($libID == 'product' or $libID == 'execution') return;
if($confirm == 'no')
{
$deleteTip = $from == 'book' ? $this->lang->doc->confirmDeleteBook : $this->lang->doc->confirmDeleteLib;
return print(js::confirm($deleteTip, $this->createLink('doc', 'deleteLib', "libID=$libID&confirm=yes")));
$deleteTip = $type == 'book' ? $this->lang->doc->confirmDeleteBook : $this->lang->doc->confirmDeleteLib;
return print(js::confirm($deleteTip, $this->createLink('doc', 'deleteLib', "libID=$libID&confirm=yes&type=$lib&from=$from")));
}
else
{
@@ -274,13 +275,9 @@ class doc extends control
return print(js::locate($this->createLink('doc', 'objectLibs', 'type=book'), 'parent.parent'));
}
$browseLink = $this->createLink('doc', 'index');
if(in_array($this->app->tab, array('product', 'project', 'execution')))
{
$objectType = $lib->type;
$objectID = $lib->{$objectType};
$browseLink = $this->createLink('doc', 'objectLibs', "type=$objectType&objectID=$objectID");
}
$objectType = $lib->type;
$objectID = strpos(',product,project,execution,', ",$objectType,") !== false ? $lib->{$objectType} : 0;
$browseLink = $this->createLink('doc', $from, "type=$objectType&objectID=$objectID");
return print(js::locate($browseLink, 'parent'));
}
module/doc/view/tablecontents.html.php
+1 -1
View File
@@ -48,7 +48,7 @@ if(empty($type)) $type = 'product';
echo "<li class='divider'></li>";
}
if($canEditLib) echo '<li>' . html::a($this->createLink('doc', 'editLib', "rootID=$libID"), '<i class="icon-edit"></i> ' . $lang->doc->editLib, '', "class='iframe'") . '</li>';
if($canDeleteLib) echo '<li>' . html::a($this->createLink('doc', 'deleteLib', "rootID=$libID"), '<i class="icon-trash"></i> ' . $lang->doc->deleteLib, 'hiddenwin') . '</li>';
if($canDeleteLib) echo '<li>' . html::a($this->createLink('doc', 'deleteLib', "rootID=$libID&confirm=no&type=lib&from=tableContents"), '<i class="icon-trash"></i> ' . $lang->doc->deleteLib, 'hiddenwin') . '</li>';
echo '</ul></div>';
}