fixed a package deployement sequencing problem
This commit is contained in:
parent
15ac233cca
commit
38be974f88
2 changed files with 6 additions and 11 deletions
|
|
@ -24,11 +24,8 @@ our @EXPORT = qw(&www_deployPackage &www_selectPackageToDeploy);
|
||||||
|
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
sub _duplicateWobjects {
|
sub _duplicateWobjects {
|
||||||
my ($sth, $wobject, $cmd, %hash, $extra, $w, %properties, $page);
|
my ($sth, $wobject, $cmd, %hash, $extra, $w, %properties);
|
||||||
tie %properties, 'Tie::CPHash';
|
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");
|
$sth = WebGUI::SQL->read("select * from wobject where pageId=$_[0] order by sequenceNumber");
|
||||||
while ($wobject = $sth->hashRef) {
|
while ($wobject = $sth->hashRef) {
|
||||||
$extra = WebGUI::SQL->quickHashRef("select * from ${$wobject}{namespace} where wobjectId=${$wobject}{wobjectId}");
|
$extra = WebGUI::SQL->quickHashRef("select * from ${$wobject}{namespace} where wobjectId=${$wobject}{wobjectId}");
|
||||||
|
|
@ -38,13 +35,6 @@ sub _duplicateWobjects {
|
||||||
$cmd = "WebGUI::Wobject::".${$wobject}{namespace};
|
$cmd = "WebGUI::Wobject::".${$wobject}{namespace};
|
||||||
$w = $cmd->new($wobject);
|
$w = $cmd->new($wobject);
|
||||||
$w->duplicate($_[1]);
|
$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;
|
$sth->finish;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -263,6 +263,11 @@ sub duplicate {
|
||||||
tie %properties, 'Tie::CPHash';
|
tie %properties, 'Tie::CPHash';
|
||||||
%properties = %{$_[0]->get};
|
%properties = %{$_[0]->get};
|
||||||
$properties{pageId} = $_[1] || 2;
|
$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) {
|
if ($properties{pageId} == 2) {
|
||||||
$properties{bufferUserId} = $session{user}{userId};
|
$properties{bufferUserId} = $session{user}{userId};
|
||||||
$properties{bufferDate} = time();
|
$properties{bufferDate} = time();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue