diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 2839c4b5a..5702e6ba0 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -18,6 +18,7 @@ - fixed: Adding Donation Asset breaks style template - fixed: Adding Flat Discount Coupon causes "Problem w/ Request" error - fixed: No label for yes/no radio buttons + - fixed: Gallery Edit Album buttons did not work properly in IE 7.5.12 - skipping this release diff --git a/docs/upgrades/packages-7.5.13/root_import_gallery-templates.wgpkg b/docs/upgrades/packages-7.5.13/root_import_gallery-templates.wgpkg index 466e55ba6..804649d19 100644 Binary files a/docs/upgrades/packages-7.5.13/root_import_gallery-templates.wgpkg and b/docs/upgrades/packages-7.5.13/root_import_gallery-templates.wgpkg differ diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm index f795a6026..39a9b1cb7 100644 --- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm +++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm @@ -914,8 +914,9 @@ sub www_edit { return $self->www_view; } # Promote the file - elsif ( $form->get("promote") ) { - my $assetId = $form->get("promote"); + elsif ( grep { $_ =~ /^promote-(.{22})$/ } $form->param ) { + my $assetId = ( grep { $_ =~ /^promote-(.{22})$/ } $form->param )[0]; + $assetId =~ s/^promote-//; my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); if ( $asset ) { $asset->promote; @@ -925,8 +926,9 @@ sub www_edit { } } # Demote the file - elsif ( $form->get("demote") ) { - my $assetId = $form->get("demote"); + elsif ( grep { $_ =~ /^demote-(.{22})$/ } $form->param ) { + my $assetId = ( grep { $_ =~ /^demote-(.{22})$/ } $form->param )[0]; + $assetId =~ s/^demote-//; my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); if ( $asset ) { $asset->demote; @@ -935,8 +937,9 @@ sub www_edit { $session->errorHandler->error("Couldn't demote asset '$assetId' because we couldn't instantiate it."); } } - elsif ( $form->get("delete") ) { - my $assetId = $form->get("delete"); + elsif ( grep { $_ =~ /^delete-(.{22})$/ } $form->param ) { + my $assetId = ( grep { $_ =~ /^delete-(.{22})$/ } $form->param )[0]; + $assetId =~ s/^delete-//; my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); if ( $asset ) { $asset->purge; @@ -989,8 +992,9 @@ sub www_edit { .= WebGUI::Form::hidden( $session, { name => "proceed", value => "showConfirmation", - }); - + }) + ; + $var->{ form_end } = WebGUI::Form::formFooter( $session ); @@ -1027,21 +1031,22 @@ sub www_edit { # Raw HTML here to provide proper value for the image $file->{ form_promote } - = qq{} ; $file->{ form_demote } - = qq{} ; - my $deleteConfirm = $i18n->get( 'template delete message', 'Asset_Photo' ); + my $deleteConfirm = $i18n->get( 'template delete message', 'Asset_Photo' ); + my $deleteLabel = $i18n->get( 'Delete', 'Icon' ); $file->{ form_delete } - = qq!} ; @@ -1051,7 +1056,7 @@ sub www_edit { value => $form->get( "fileSynopsis_$file->{assetId}" ) || $file->{ synopsis }, richEditId => $self->getParent->get( 'richEditIdFile' ), height => 150, - width => 400, + width => 300, }); }