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

Do not display a select all button in the AssetManager unless there's more than 1 asset.

Browse source
This commit is contained in:
Colin Kuskie 2009-06-17 17:44:45 +00:00
parent 4320d39b1c
commit d1038fb698
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@
editing a Thing and the 'return after edit' setting was set to 'Thing editing a Thing and the 'return after edit' setting was set to 'Thing
Default' ( Martin Kamerbeek / Oqapi ) Default' ( Martin Kamerbeek / Oqapi )
- fixed: In the Asset Manager, if you pasted an asset if returned you to the page instead the manager. - fixed: In the Asset Manager, if you pasted an asset if returned you to the page instead the manager.
- fixed: In the Asset Manager, only display a Select All button if there is more than one asset.
7.7.10 7.7.10
- Made a change to LDAP auth that adds an OR to that query so that it also searches for a row with fieldData REGEXP '^uid=(value-from-ldap-directory-server),'. (Wes Morgan) - Made a change to LDAP auth that adds an OR to that query so that it also searches for a row with fieldData REGEXP '^uid=(value-from-ldap-directory-server),'. (Wes Morgan)

9
lib/WebGUI/Content/AssetManager.pm
View file

@ -464,16 +464,21 @@ ENDHTML
tie my %options, 'Tie::IxHash'; tie my %options, 'Tie::IxHash';
my $hasClips = 0; my $hasClips = 0;
my $clipNum = 0;
foreach my $asset (@{$currentAsset->getAssetsInClipboard(1)}) { foreach my $asset (@{$currentAsset->getAssetsInClipboard(1)}) {
$options{$asset->getId} = '<img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" style="border: 0px;" /> '.$asset->getTitle; $options{$asset->getId} = '<img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" style="border: 0px;" /> '.$asset->getTitle;
$hasClips = 1; $hasClips = 1;
$clipNum++;
} }
if ($hasClips) { if ($hasClips) {
$output .= '<div class="functionPane"><fieldset><legend>'.$i18n->get(1082).'</legend>' $output .= '<div class="functionPane"><fieldset><legend>'.$i18n->get(1082).'</legend>'
.WebGUI::Form::formHeader($session, {action=>$currentAsset->getUrl}) .WebGUI::Form::formHeader($session, {action=>$currentAsset->getUrl})
.WebGUI::Form::hidden($session,{name=>"func",value=>"pasteList"}) .WebGUI::Form::hidden($session,{name=>"func",value=>"pasteList"})
.WebGUI::Form::checkbox($session,{extras=>'onclick="toggleClipboardSelectAll(this.form);"'}) .( $clipNum > 1
.' '.$i18n->get("select all").'<br />' ? WebGUI::Form::checkbox($session,{extras=>'onclick="toggleClipboardSelectAll(this.form);"'}).' '.$i18n->get("select all").'<br />'
: ''
)
.WebGUI::Form::checkList($session,{name=>"assetId",vertical=>1,options=>\%options}) .WebGUI::Form::checkList($session,{name=>"assetId",vertical=>1,options=>\%options})
.'<br />' .'<br />'
.WebGUI::Form::submit($session,{value=>"Paste"}) .WebGUI::Form::submit($session,{value=>"Paste"})