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

add clipboard admin setting

Browse source
This commit is contained in:
Graham Knop 2009-10-28 10:22:43 -05:00
parent c22c5ef3f7
commit c472e0c4b8
5 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -17,6 +17,7 @@
- fixed #10887: Map Point dropdown doesn't update - fixed #10887: Map Point dropdown doesn't update
- fixed #11172: Collaboration broken vars: isSecond, isThird etc. - fixed #11172: Collaboration broken vars: isSecond, isThird etc.
- fixed #11165: DatePicker broken in IE7 - fixed #11165: DatePicker broken in IE7
- added: Manage System Clipboard group setting
7.8.2 7.8.2
- Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi) - Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi)

10
docs/upgrades/upgrade_7.8.2-7.8.3.pl
View file

@ -33,8 +33,18 @@ my $session = start(); # this line required
# upgrade functions go here # upgrade functions go here
reKeyTemplateAttachments($session); reKeyTemplateAttachments($session);
addSelectPaymentGatewayTemplateToSettings($session); addSelectPaymentGatewayTemplateToSettings($session);
addClipboardAdminSetting($session);
finish($session); # this line required finish($session); # this line required
#----------------------------------------------------------------------------
sub addClipboardAdminSetting {
my $session = shift;
print "\tAdding clipboard admin setting... " unless $quiet;
$session->setting->add('groupIdAdminClipboard', 3);
print "Done.\n" unless $quiet;
}
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Describe what our function does # Describe what our function does

39
lib/WebGUI/AssetClipboard.pm
View file

@ -444,7 +444,7 @@ sub www_emptyClipboard {
my $self = shift; my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"clipboard"); my $ac = WebGUI::AdminConsole->new($self->session,"clipboard");
return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(4)); return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(4));
foreach my $asset (@{$self->getAssetsInClipboard(!($self->session->form->process("systemClipboard") && $self->session->user->isAdmin))}) { foreach my $asset (@{$self->getAssetsInClipboard(!($self->session->form->process("systemClipboard") && $self->session->user->isInGroup($self->session->setting->get('groupIdAdminClipboard'))))}) {
$asset->trash; $asset->trash;
} }
return $self->www_manageClipboard(); return $self->www_manageClipboard();
@ -464,20 +464,29 @@ sub www_manageClipboard {
my $ac = WebGUI::AdminConsole->new($self->session,"clipboard"); my $ac = WebGUI::AdminConsole->new($self->session,"clipboard");
return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(12)); return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(12));
my $i18n = WebGUI::International->new($self->session, "Asset"); my $i18n = WebGUI::International->new($self->session, "Asset");
my ($header,$limit);
if ($self->session->form->process("systemClipboard") && $self->session->user->isAdmin) { my $header;
$header = $i18n->get(966); my $limit = 1;
$ac->addSubmenuItem($self->getUrl('func=manageClipboard'), $i18n->get(949));
$ac->addSubmenuItem($self->getUrl('func=emptyClipboard;systemClipboard=1'), $i18n->get(959), my $canAdmin = $self->session->user->isInGroup($self->session->setting->get('groupIdAdminClipboard'));
'onclick="return window.confirm(\''.$i18n->get(951,"WebGUI").'\')"',"Asset"); if ($self->session->form->process("systemClipboard") && $canAdmin) {
} else { $header = $i18n->get(966);
$ac->addSubmenuItem($self->getUrl('func=manageClipboard;systemClipboard=1'), $i18n->get(954)); $ac->addSubmenuItem($self->getUrl('func=manageClipboard'), $i18n->get(949));
$ac->addSubmenuItem($self->getUrl('func=emptyClipboard'), $i18n->get(950), $ac->addSubmenuItem($self->getUrl('func=emptyClipboard;systemClipboard=1'), $i18n->get(959),
'onclick="return window.confirm(\''.$i18n->get(951,"WebGUI").'\')"',"Asset"); 'onclick="return window.confirm(\''.$i18n->get(951,"WebGUI").'\')"',"Asset");
$limit = 1; $limit = undef;
} }
$self->session->style->setLink($self->session->url->extras('assetManager/assetManager.css'), {rel=>"stylesheet",type=>"text/css"}); elsif ( $canAdmin ) {
$self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'), {type=>"text/javascript"}); $ac->addSubmenuItem($self->getUrl('func=manageClipboard;systemClipboard=1'), $i18n->get(954));
$ac->addSubmenuItem($self->getUrl('func=emptyClipboard'), $i18n->get(950),
'onclick="return window.confirm(\''.$i18n->get(951,"WebGUI").'\')"',"Asset");
}
else {
$ac->addSubmenuItem($self->getUrl('func=emptyClipboard'), $i18n->get(950),
'onclick="return window.confirm(\''.$i18n->get(951,"WebGUI").'\')"',"Asset");
}
$self->session->style->setLink($self->session->url->extras('assetManager/assetManager.css'), {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'), {type=>"text/javascript"});
my $output = " my $output = "
<script type=\"text/javascript\"> <script type=\"text/javascript\">
//<![CDATA[ //<![CDATA[

1
lib/WebGUI/Operation/Settings.pm
View file

@ -520,6 +520,7 @@ sub definition {
groupIdAdminActiveSessions groupIdAdminActiveSessions
groupIdAdminAdSpace groupIdAdminAdSpace
groupIdAdminCache groupIdAdminCache
groupIdAdminClipboard
groupIdAdminCron groupIdAdminCron
groupIdAdminDatabaseLink groupIdAdminDatabaseLink
groupIdAdminFilePump groupIdAdminFilePump

9
lib/WebGUI/i18n/English/WebGUI.pm
View file

@ -3904,6 +3904,15 @@ LongTruncOk=1</p>
}, },
'settings groupIdAdminClipboard label' => {
message => q{Clipboard},
lastUpdated => 0,
},
'settings groupIdAdminClipboard hoverHelp' => {
message => q{Group to manage the system clipboard.},
lastUpdated => 0,
},
'settings groupIdAdminCron label' => { 'settings groupIdAdminCron label' => {
message => q{Cron}, message => q{Cron},