diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 21b07f0e9..5ceb759d0 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -8,6 +8,7 @@ - added File::Path 2.04 as a prerequisite - fixed: Asset Manager shows data error when no child assets to display - changed: show 25 items per page in asset manager + - fixed: Asset Manager buttons now work in IE6 7.5.15 - fixed: Colorpicker window would not open (Martin Kamerbeek / Oqapi) diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm index f14d25fee..6951d5be2 100644 --- a/lib/WebGUI/Content/AssetManager.pm +++ b/lib/WebGUI/Content/AssetManager.pm @@ -326,48 +326,46 @@ sub www_manage { my $i18n = WebGUI::International->new( $session, "Asset" ); ### Do Action - if ( my $action = $session->form->get( 'action' ) ) { - my @assetIds = $session->form->get( 'assetId' ); + my @assetIds = $session->form->get( 'assetId' ); - if ( $action eq "update" ) { - for my $assetId ( @assetIds ) { - my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); - next unless $asset; - my $rank = $session->form->get( $assetId . '_rank' ); - next unless $rank; # There's no such thing as zero + if ( $session->form->get( 'action_update' ) ) { + for my $assetId ( @assetIds ) { + my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); + next unless $asset; + my $rank = $session->form->get( $assetId . '_rank' ); + next unless $rank; # There's no such thing as zero - $asset->setRank( $rank ); - } + $asset->setRank( $rank ); } - elsif ( $action eq "trash" ) { - for my $assetId ( @assetIds ) { - my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); - next unless $asset; - $asset->trash; - } + } + elsif ( $session->form->get( 'action_delete' ) ) { + for my $assetId ( @assetIds ) { + my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); + next unless $asset; + $asset->trash; } - elsif ( $action eq "cut" ) { - for my $assetId ( @assetIds ) { - my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); - next unless $asset; - $asset->cut; - } + } + elsif ( $session->form->get( 'action_cut' ) ) { + for my $assetId ( @assetIds ) { + my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); + next unless $asset; + $asset->cut; } - elsif ( $action eq "copy" ) { - for my $assetId ( @assetIds ) { - # Copy == Duplicate + Cut - my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId); - my $newAsset = $asset->duplicate( { skipAutoCommitWorkflows => 1 } ); - $newAsset->update( { title => $newAsset->getTitle . ' (copy)' } ); - $newAsset->cut; - } + } + elsif ( $session->form->get( 'action_copy' ) ) { + for my $assetId ( @assetIds ) { + # Copy == Duplicate + Cut + my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId); + my $newAsset = $asset->duplicate( { skipAutoCommitWorkflows => 1 } ); + $newAsset->update( { title => $newAsset->getTitle . ' (copy)' } ); + $newAsset->cut; } - elsif ( $action eq "duplicate" ) { - for my $assetId ( @assetIds ) { - my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); - next unless $asset; - $asset->duplicate( { skipAutoCommitWorkflows => 1 } ); - } + } + elsif ( $session->form->get( 'action_duplicate' ) ) { + for my $assetId ( @assetIds ) { + my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); + next unless $asset; + $asset->duplicate( { skipAutoCommitWorkflows => 1 } ); } } @@ -420,11 +418,11 @@ ENDHTML . q{
} . $i18n->get( 'with selected' ) - . q{} - . q{} - . q{} - . q{} - . q{} + . q{} + . q{} + . q{} + . q{} + . q{} . q{
} . q{} . q{