diff --git a/lib/WebGUI/Operation/Package.pm b/lib/WebGUI/Operation/Package.pm index 8f99d3904..d95531ab6 100644 --- a/lib/WebGUI/Operation/Package.pm +++ b/lib/WebGUI/Operation/Package.pm @@ -24,11 +24,8 @@ our @EXPORT = qw(&www_deployPackage &www_selectPackageToDeploy); #------------------------------------------------------------------- sub _duplicateWobjects { - my ($sth, $wobject, $cmd, %hash, $extra, $w, %properties, $page); + my ($sth, $wobject, $cmd, %hash, $extra, $w, %properties); tie %properties, 'Tie::CPHash'; - #-- Added by Frank Dillon. Get page privilege information for the package - $page = WebGUI::SQL->quickHashRef("select ownerId,groupIdView,groupIdEdit from page where pageId=".quote($_[0])); - #-- End Changes $sth = WebGUI::SQL->read("select * from wobject where pageId=$_[0] order by sequenceNumber"); while ($wobject = $sth->hashRef) { $extra = WebGUI::SQL->quickHashRef("select * from ${$wobject}{namespace} where wobjectId=${$wobject}{wobjectId}"); @@ -38,13 +35,6 @@ sub _duplicateWobjects { $cmd = "WebGUI::Wobject::".${$wobject}{namespace}; $w = $cmd->new($wobject); $w->duplicate($_[1]); - #-- Added by Frank Dillon. Set privileges for newly duplicated wobjects - %properties=(); - $properties{ownerId} = ${$page}{ownerId}; - $properties{groupIdView} = ${$page}{groupIdView}; - $properties{groupIdEdit} = ${$page}{groupIdEdit}; - $w->set(\%properties); - #-- End Changes } $sth->finish; } diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm index e645a042f..d963ea7fa 100644 --- a/lib/WebGUI/Wobject.pm +++ b/lib/WebGUI/Wobject.pm @@ -263,6 +263,11 @@ sub duplicate { tie %properties, 'Tie::CPHash'; %properties = %{$_[0]->get}; $properties{pageId} = $_[1] || 2; + $properties{sequenceNumber} = _getNextSequenceNumber($properties{pageId}); + my $page = WebGUI::SQL->quickHashRef("select groupIdView,ownerId,groupIdEdit from page where pageId=".$properties{pageId}); + $properties{ownerId} = $page->{ownerId}; + $properties{groupIdView} = $page->{groupIdView}; + $properties{groupIdEdit} = $page->{groupIdEdit}; if ($properties{pageId} == 2) { $properties{bufferUserId} = $session{user}{userId}; $properties{bufferDate} = time();