Forward port button tag and version tag start and end date fixes.
This commit is contained in:
parent
784461481f
commit
af46a10d6d
3 changed files with 16 additions and 9 deletions
|
|
@ -21,6 +21,7 @@
|
||||||
- fixed #9315: Password Recovery
|
- fixed #9315: Password Recovery
|
||||||
- fixed #9298: Inconsistent date formats
|
- fixed #9298: Inconsistent date formats
|
||||||
- fixed #9296: Thingy View template not recognising field_isVisible (SDH Consulting Group)
|
- fixed #9296: Thingy View template not recognising field_isVisible (SDH Consulting Group)
|
||||||
|
- fixed #4196: update button doesn't work in IE
|
||||||
|
|
||||||
7.6.6
|
7.6.6
|
||||||
- fixed #8792: Image Preview gives ERROR in Collateral Manager
|
- fixed #8792: Image Preview gives ERROR in Collateral Manager
|
||||||
|
|
|
||||||
|
|
@ -642,7 +642,8 @@ sub www_manageRevisionsInTag {
|
||||||
$ac->addSubmenuItem($session->url->page('op=manageVersions'), $i18n->get("manage versions"));
|
$ac->addSubmenuItem($session->url->page('op=manageVersions'), $i18n->get("manage versions"));
|
||||||
|
|
||||||
# Process any actions
|
# Process any actions
|
||||||
if ( $session->form->get('action') eq "purge" ) {
|
my $action = lc $session->form->get('action');
|
||||||
|
if ( $action eq "purge" ) {
|
||||||
# Purge these revisions
|
# Purge these revisions
|
||||||
my @assetInfo = $session->form->get('assetInfo');
|
my @assetInfo = $session->form->get('assetInfo');
|
||||||
for my $assetInfo ( @assetInfo ) {
|
for my $assetInfo ( @assetInfo ) {
|
||||||
|
|
@ -657,7 +658,7 @@ sub www_manageRevisionsInTag {
|
||||||
return www_manageVersions( $session );
|
return www_manageVersions( $session );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elsif ( $session->form->get('action') eq "move" ) {
|
elsif ( $action eq "move to:" ) {
|
||||||
# Get the new version tag
|
# Get the new version tag
|
||||||
my $moveToTagId = $session->form->get('moveToTagId');
|
my $moveToTagId = $session->form->get('moveToTagId');
|
||||||
my $moveToTag;
|
my $moveToTag;
|
||||||
|
|
@ -685,7 +686,7 @@ sub www_manageRevisionsInTag {
|
||||||
return www_manageVersions( $session );
|
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 $startTime = WebGUI::DateTime->new($session,$session->form->process("startTime","dateTime"))->toDatabase;
|
||||||
my $endTime = WebGUI::DateTime->new($session,$session->form->process("endTime","dateTime"))->toDatabase;
|
my $endTime = WebGUI::DateTime->new($session,$session->form->process("endTime","dateTime"))->toDatabase;
|
||||||
|
|
||||||
|
|
@ -746,6 +747,10 @@ sub www_manageRevisionsInTag {
|
||||||
( getVersionTagOptions( $session ) ),
|
( 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
|
# Output the revisions
|
||||||
### FIXME: Users who only pass canApproveVersionTag() and not canViewVersionTag() should
|
### 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
|
# 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').': '
|
. $i18n->get('startTime label').': '
|
||||||
. WebGUI::Form::dateTime($session, {
|
. WebGUI::Form::dateTime($session, {
|
||||||
name =>"startTime",
|
name =>"startTime",
|
||||||
value => WebGUI::DateTime->new($session,$tag->get("startTime"))->epoch,
|
value => WebGUI::DateTime->new($session,$filterStartTime)->epoch,
|
||||||
})
|
})
|
||||||
. '<br />'.$i18n->get('endTime label').': '
|
. '<br />'.$i18n->get('endTime label').': '
|
||||||
. WebGUI::Form::dateTime($session,{
|
. WebGUI::Form::dateTime($session,{
|
||||||
name =>"endTime",
|
name =>"endTime",
|
||||||
value => WebGUI::DateTime->new($session,$tag->get("endTime"))->epoch,
|
value => WebGUI::DateTime->new($session,$filterEndTime)->epoch,
|
||||||
})
|
})
|
||||||
. '<br />'
|
. '<br />'
|
||||||
. '<button name="action" value="update">' . $i18n->get('manageRevisionsInTag update') . '</button>'
|
. '<input type="submit" name="action" value="'. $i18n->get('manageRevisionsInTag update') . '" />'
|
||||||
. '</td>'
|
. '</td>'
|
||||||
. '</tr>'
|
. '</tr>'
|
||||||
. '<tr><td colspan="5"> </td></tr>'
|
. '<tr><td colspan="5"> </td></tr>'
|
||||||
. '<tr>'
|
. '<tr>'
|
||||||
. '<td colspan="5">'
|
. '<td colspan="5">'
|
||||||
. $i18n->get("manageRevisionsInTag with selected")
|
. $i18n->get("manageRevisionsInTag with selected")
|
||||||
. '<button name="action" value="purge" class="red">' . $i18n->get('manageRevisionsInTag purge') . '</button>'
|
. '<input type="submit" name="action" value="'. $i18n->get('manageRevisionsInTag purge') . '" class="red" />'
|
||||||
. '<button name="action" value="move">' . $i18n->get("manageRevisionsInTag move") . '</button>'
|
. '<input type="submit" name="action" value="'. $i18n->get("manageRevisionsInTag move") . '" />'
|
||||||
. WebGUI::Form::SelectBox( $session, {
|
. WebGUI::Form::SelectBox( $session, {
|
||||||
name => 'moveToTagId',
|
name => 'moveToTagId',
|
||||||
options => \%moveToTagOptions,
|
options => \%moveToTagOptions,
|
||||||
|
|
|
||||||
|
|
@ -374,7 +374,7 @@ our $I18N = {
|
||||||
},
|
},
|
||||||
|
|
||||||
'manageRevisionsInTag update' => {
|
'manageRevisionsInTag update' => {
|
||||||
message => q{Update},
|
message => q{Update Version Tag},
|
||||||
lastUpdated => 0,
|
lastUpdated => 0,
|
||||||
context => q{Label for button to update revisions},
|
context => q{Label for button to update revisions},
|
||||||
},
|
},
|
||||||
|
|
@ -476,6 +476,7 @@ our $I18N = {
|
||||||
lastUpdated => 0,
|
lastUpdated => 0,
|
||||||
context => q{Explanation of Permission Denied message},
|
context => q{Explanation of Permission Denied message},
|
||||||
},
|
},
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue