diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index b75ff6a23..e66378190 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -22,6 +22,7 @@ - fixed #11940: quickCSV chokes on newlines in data - fixed #11933: EMS shows a dollar currency symbol on Badge Listing - fixed #11941: cannot edit default templates in some browsers + - fixed #11926: Version Tag: Delete 7.10.3 - fixed #11903: Unnecessary debug in Thingy diff --git a/lib/WebGUI/Operation/VersionTag.pm b/lib/WebGUI/Operation/VersionTag.pm index 214b15af6..5fce10cd9 100644 --- a/lib/WebGUI/Operation/VersionTag.pm +++ b/lib/WebGUI/Operation/VersionTag.pm @@ -702,8 +702,9 @@ sub www_manageRevisionsInTag { # Process any actions my $action = lc $session->form->get('action'); + my $form = $session->form; my $validToken = $session->form->validToken; - if ( $action eq "purge" && $validToken) { + if ( $form->get('purge') && $validToken) { # Purge these revisions my @assetInfo = $session->form->get('assetInfo'); for my $assetInfo ( @assetInfo ) { @@ -718,7 +719,7 @@ sub www_manageRevisionsInTag { return www_manageVersions( $session ); } } - elsif ( $action eq "move to:" && $validToken) { + elsif ( $form->get('moveto') && $validToken) { # Get the new version tag my $moveToTagId = $session->form->get('moveToTagId'); my $moveToTag; @@ -746,7 +747,7 @@ sub www_manageRevisionsInTag { return www_manageVersions( $session ); } } - elsif ( $action eq "update version tag" && $validToken) { + elsif ( $form->get('update') && $validToken) { my $startTime = WebGUI::DateTime->new($session,$session->form->process("startTime","dateTime"))->toDatabase; my $endTime = WebGUI::DateTime->new($session,$session->form->process("endTime","dateTime"))->toDatabase; @@ -832,19 +833,19 @@ sub www_manageRevisionsInTag { value => WebGUI::DateTime->new($session,$filterEndTime)->epoch, }) . '
' - . '' + . '' . '' . '' . ' ' . '' . '' . $i18n->get("manageRevisionsInTag with selected") - . '' + . '' . WebGUI::Form::SelectBox( $session, { name => 'moveToTagId', options => \%moveToTagOptions, } ) - . ' ' + . ' ' . '' . '' . ''