Preparing for 4.6.0 release.
This commit is contained in:
parent
99ca8bcf6c
commit
b3ceea7566
3 changed files with 28 additions and 11 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -27,7 +27,7 @@ use WebGUI::Utility;
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
sub page {
|
sub page {
|
||||||
my ($debug, %contentHash, $w, $cmd, $pageEdit, $wobject, $wobjectOutput, $extra, $originalWobject, $proxyWobjectId,
|
my ($debug, %contentHash, $w, $cmd, $pageEdit, $wobject, $wobjectOutput, $extra, $originalWobject, $proxyWobjectId,
|
||||||
$sth, $httpHeader, $header, $footer, $content, $operationOutput, $adminBar, %hash);
|
$sth, $httpHeader, $header, $footer, $content, $operationOutput, $adminBar, %hash, $canEdit);
|
||||||
WebGUI::Session::open($_[0],$_[1]);
|
WebGUI::Session::open($_[0],$_[1]);
|
||||||
if (exists $session{form}{op}) {
|
if (exists $session{form}{op}) {
|
||||||
$cmd = "WebGUI::Operation::www_".$session{form}{op};
|
$cmd = "WebGUI::Operation::www_".$session{form}{op};
|
||||||
|
|
@ -91,18 +91,21 @@ sub page {
|
||||||
} else {
|
} else {
|
||||||
if (WebGUI::Privilege::canViewPage()) {
|
if (WebGUI::Privilege::canViewPage()) {
|
||||||
if ($session{var}{adminOn}) {
|
if ($session{var}{adminOn}) {
|
||||||
$pageEdit = "\n<br>"
|
$canEdit = WebGUI::Privilege::canEditPage();
|
||||||
.pageIcon()
|
if ($canEdit) {
|
||||||
.deleteIcon('op=deletePage')
|
$pageEdit = "\n<br>"
|
||||||
.editIcon('op=editPage')
|
.pageIcon()
|
||||||
.moveUpIcon('op=movePageUp')
|
.deleteIcon('op=deletePage')
|
||||||
.moveDownIcon('op=movePageDown')
|
.editIcon('op=editPage')
|
||||||
.cutIcon('op=cutPage')
|
.moveUpIcon('op=movePageUp')
|
||||||
."\n";
|
.moveDownIcon('op=movePageDown')
|
||||||
|
.cutIcon('op=cutPage')
|
||||||
|
."\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$sth = WebGUI::SQL->read("select * from wobject where pageId=$session{page}{pageId} order by sequenceNumber, wobjectId");
|
$sth = WebGUI::SQL->read("select * from wobject where pageId=$session{page}{pageId} order by sequenceNumber, wobjectId");
|
||||||
while ($wobject = $sth->hashRef) {
|
while ($wobject = $sth->hashRef) {
|
||||||
if ($session{var}{adminOn}) {
|
if ($session{var}{adminOn} && $canEdit) {
|
||||||
$contentHash{${$wobject}{templatePosition}} .= "\n<hr>"
|
$contentHash{${$wobject}{templatePosition}} .= "\n<hr>"
|
||||||
.deleteIcon('func=delete&wid='.${$wobject}{wobjectId})
|
.deleteIcon('func=delete&wid='.${$wobject}{wobjectId})
|
||||||
.editIcon('func=edit&wid='.${$wobject}{wobjectId})
|
.editIcon('func=edit&wid='.${$wobject}{wobjectId})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue