oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

when purging from system trash, return to system trash. Fixes bug #11509.

Browse source
This commit is contained in:
Colin Kuskie 2010-03-31 17:23:19 -07:00
parent defc82198d
commit 195218cbaf
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/WebGUI/AssetTrash.pm
View file

@ -396,7 +396,8 @@ sub www_manageTrash {
my $header;
my $limit = 1;
my $canAdmin = $self->session->user->isInGroup($self->session->setting->get('groupIdAdminTrash'));
if ($self->session->form->process("systemTrash") && $canAdmin) {
my $systemTrash = $self->session->form->process("systemTrash");
if ($systemTrash && $canAdmin) {
$header = $i18n->get(965);
$ac->addSubmenuItem($self->getUrl('func=manageTrash'), $i18n->get(10,"WebGUI"));
$limit = undef;
@ -436,6 +437,7 @@ sub www_manageTrash {
assetManager.AddButton("'.$i18n->get("restore").'","restoreList","manageTrash");
assetManager.AddButton("'.$i18n->get("purge").'","purgeList","manageTrash");
assetManager.AddFormHidden({ name:"webguiCsrfToken", value:"'.$self->session->scratch->get('webguiCsrfToken').'"});
assetManager.AddFormHidden({ name:"systemTrash", value:"'.$systemTrash.'"});
assetManager.Write();
var assetListSelectAllToggle = false;
function toggleAssetListSelectAll(form) {
@ -485,6 +487,9 @@ sub www_purgeList {
}
}
my $method = ($session->form->process("proceed")) ? $session->form->process('proceed') : 'manageTrash';
if ($session->form->process('systemTrash') ) {
$method .= ';systemTrash=1';
}
$pb->finish($self->getUrl('func='.$method));
}