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

Merge branch 'sprint/189_hufangzhou_22364' into 'master'

Browse Source 
* Fix bug #22364.

See merge request easycorp/zentaopms!3358
This commit is contained in:
王怡栋
2022-05-12 05:38:14 +00:00
parent 70fcf381cf d99acc8cf8
commit 9cd2982d2e
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/control.php
+15 -2
View File
@@ -104,8 +104,15 @@ class action extends control
*/
public function undelete($actionID)
{
$oldAction = $this->action->getById($actionID);
$extra = $oldAction->extra == ACTIONMODEL::BE_HIDDEN ? 'hidden' : 'all';
$this->action->undelete($actionID);
echo js::reload('parent');
$sameTypeObjects = $this->action->getTrashes($oldAction->objectType, $extra, 'id_desc', null);
$browseType = $sameTypeObjects ? $oldAction->objectType : 'all';
return print(js::locate($this->createLink('action', 'trash', "browseType=$browseType&type=$extra"), 'parent'));
}
/**
@@ -117,8 +124,14 @@ class action extends control
*/
public function hideOne($actionID)
{
$oldAction = $this->action->getById($actionID);
$this->action->hideOne($actionID);
echo js::reload('parent');
$sameTypeObjects = $this->action->getTrashes($oldAction->objectType, 'all', 'id_desc', null);
$browseType = $sameTypeObjects ? $oldAction->objectType : 'all';
return print(js::locate($this->createLink('action', 'trash', "browseType=$browseType"), 'parent'));
}
/**