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

Forward port button tag and version tag start and end date fixes.

Browse source
This commit is contained in:
Colin Kuskie 2008-12-18 02:17:13 +00:00
parent 784461481f
commit af46a10d6d
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/WebGUI/Operation/VersionTag.pm
View file

@ -642,7 +642,8 @@ sub www_manageRevisionsInTag {
$ac->addSubmenuItem($session->url->page('op=manageVersions'), $i18n->get("manage versions"));
# Process any actions
if ( $session->form->get('action') eq "purge" ) {
my $action = lc $session->form->get('action');
if ( $action eq "purge" ) {
# Purge these revisions
my @assetInfo = $session->form->get('assetInfo');
for my $assetInfo ( @assetInfo ) {
@ -657,7 +658,7 @@ sub www_manageRevisionsInTag {
return www_manageVersions( $session );
}
}
elsif ( $session->form->get('action') eq "move" ) {
elsif ( $action eq "move to:" ) {
# Get the new version tag
my $moveToTagId = $session->form->get('moveToTagId');
my $moveToTag;
@ -685,7 +686,7 @@ sub www_manageRevisionsInTag {
return www_manageVersions( $session );
}
}
elsif ( $session->form->get('action') eq "update" ) {
elsif ( $action eq "update version tag" ) {
my $startTime = WebGUI::DateTime->new($session,$session->form->process("startTime","dateTime"))->toDatabase;
my $endTime = WebGUI::DateTime->new($session,$session->form->process("endTime","dateTime"))->toDatabase;
@ -746,6 +747,10 @@ sub www_manageRevisionsInTag {
( getVersionTagOptions( $session ) ),
);
##Setup valid times for the datetime range form
my $filterStartTime = defined $tag->get('startTime') ? $tag->get('startTime') : '1970-01-17 05:00:00';
my $filterEndTime = defined $tag->get('endTime') ? $tag->get('endTime') : time();
# Output the revisions
### FIXME: Users who only pass canApproveVersionTag() and not canViewVersionTag() should
# probably not be allowed to see the Actions or modify the Start and End dates
@ -759,23 +764,23 @@ sub www_manageRevisionsInTag {
. $i18n->get('startTime label').': '
. WebGUI::Form::dateTime($session, {
name =>"startTime",
value => WebGUI::DateTime->new($session,$tag->get("startTime"))->epoch,
value => WebGUI::DateTime->new($session,$filterStartTime)->epoch,
})
. '<br />'.$i18n->get('endTime label').':&nbsp;'
. WebGUI::Form::dateTime($session,{
name =>"endTime",
value => WebGUI::DateTime->new($session,$tag->get("endTime"))->epoch,
value => WebGUI::DateTime->new($session,$filterEndTime)->epoch,
})
. '<br />'
. '<button name="action" value="update">' . $i18n->get('manageRevisionsInTag update') . '</button>'
. '<input type="submit" name="action" value="'. $i18n->get('manageRevisionsInTag update') . '" />'
. '</td>'
. '</tr>'
. '<tr><td colspan="5">&nbsp;</td></tr>'
. '<tr>'
. '<td colspan="5">'
. $i18n->get("manageRevisionsInTag with selected")
. '<button name="action" value="purge" class="red">' . $i18n->get('manageRevisionsInTag purge') . '</button>'
. '<button name="action" value="move">' . $i18n->get("manageRevisionsInTag move") . '</button>'
. '<input type="submit" name="action" value="'. $i18n->get('manageRevisionsInTag purge') . '" class="red" />'
. '<input type="submit" name="action" value="'. $i18n->get("manageRevisionsInTag move") . '" />'
. WebGUI::Form::SelectBox( $session, {
name => 'moveToTagId',
options => \%moveToTagOptions,