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

merging forward 6.8.8 bugfix of [ 1423434 ] 6.8.5 - Versioning - users can see uncommitted data

Browse source
This commit is contained in:
JT Smith 2006-03-15 06:54:17 +00:00
parent 0197f6f1bd
commit 9ff3308126
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/6.x.x.txt
View file

@ -65,6 +65,7 @@
- fix [ 1429389 ] 6.9: "1" appended to HTML - fix [ 1429389 ] 6.9: "1" appended to HTML
6.8.8 6.8.8
- fix [ 1423434 ] 6.8.5 - Versioning - users can see uncommitted data
- fix [ 1437186 ] 6.8.7 deploy DataForm package does not copy fields - fix [ 1437186 ] 6.8.7 deploy DataForm package does not copy fields
- fix [ 1437563 ] Data picker intermittent for Admin - fix [ 1437563 ] Data picker intermittent for Admin
- fix broken link to top of CS Assets configured as FAQs - fix broken link to top of CS Assets configured as FAQs

2
lib/WebGUI/Asset.pm
View file

@ -196,7 +196,7 @@ sub definition {
status=>{ status=>{
noFormPost=>1, noFormPost=>1,
fieldType=>'hidden', fieldType=>'hidden',
defaultValue=>'approved' defaultValue=>'pending'
}, },
assetSize=>{ assetSize=>{
noFormPost=>1, noFormPost=>1,

5
lib/WebGUI/AssetVersioning.pm
View file

@ -69,8 +69,9 @@ sub addRevision {
my $newVersion = WebGUI::Asset->new($self->session,$self->getId, $self->get("className"), $now); my $newVersion = WebGUI::Asset->new($self->session,$self->getId, $self->get("className"), $now);
$newVersion->updateHistory("created revision"); $newVersion->updateHistory("created revision");
$newVersion->update($self->get); $newVersion->update($self->get);
$newVersion->setVersionLock; $newVersion->{isLockedBy} = $self->session->user->userId;
$newVersion->update($properties) if (defined $properties); $properties->{status} = 'pending';
$newVersion->update($properties);
return $newVersion; return $newVersion;
} }