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

make sure we are using var->isAdminOn instead of var->get('adminOn')

Browse source
This commit is contained in:
Graham Knop 2008-09-18 19:51:25 +00:00
parent eca7ffbe9d
commit 7bf06aab7b
9 changed files with 16 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset.pm
View file

@ -2381,7 +2381,7 @@ The default view method for any asset that doesn't define one. Under all normal
sub view { sub view {
my $self = shift; my $self = shift;
if ($self->session->var->get("adminOn")) { if ($self->session->var->isAdminOn) {
return $self->getToolbar.' '.$self->getTitle; return $self->getToolbar.' '.$self->getTitle;
} else { } else {
return ""; return "";

2
lib/WebGUI/Asset/Redirect.pm
View file

@ -118,7 +118,7 @@ Display the redirect url when in admin mode.
sub view { sub view {
my $self = shift; my $self = shift;
if ($self->session->var->get("adminOn")) { if ($self->session->var->isAdminOn) {
return $self->getToolbar.' '.$self->getTitle.' '.$self->get('redirectUrl'); return $self->getToolbar.' '.$self->getTitle.' '.$self->get('redirectUrl');
} }
else { else {

4
lib/WebGUI/Asset/Shortcut.pm
View file

@ -393,7 +393,7 @@ sub getOverridesList {
sub _overridesCacheTag { sub _overridesCacheTag {
my $self = shift; my $self = shift;
#cache by userId, assetId of this shortcut, and whether adminMode is on or not. #cache by userId, assetId of this shortcut, and whether adminMode is on or not.
return ["shortcutOverrides", $self->getId, $self->session->user->userId, $self->session->var->get("adminOn")]; return ["shortcutOverrides", $self->getId, $self->session->user->userId, $self->session->var->isAdminOn];
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -492,7 +492,7 @@ sub getShortcutByCriteria {
if ($assetId) { if ($assetId) {
$scratchId = "Shortcut_" . $assetId; $scratchId = "Shortcut_" . $assetId;
if($self->session->scratch->get($scratchId) && !$self->getValue("disableContentLock")) { if($self->session->scratch->get($scratchId) && !$self->getValue("disableContentLock")) {
unless ($self->session->var->get("adminOn")) { unless ($self->session->var->isAdminOn) {
return WebGUI::Asset->newByDynamicClass($self->session, $self->session->scratch->get($scratchId)); return WebGUI::Asset->newByDynamicClass($self->session, $self->session->scratch->get($scratchId));
} }
} }

6
lib/WebGUI/Asset/Wobject/Dashboard.pm
View file

@ -315,7 +315,7 @@ sub view {
} }
} }
} }
$vars{showAdmin} = ($self->session->var->get("adminOn") && $self->canEdit); $vars{showAdmin} = ($self->session->var->isAdminOn && $self->canEdit);
$vars{"dragger.init"} = ' $vars{"dragger.init"} = '
<script type="text/javascript"> <script type="text/javascript">
dragable_init("'.$self->getUrl.'"); dragable_init("'.$self->getUrl.'");
@ -352,10 +352,10 @@ sub www_view {
unless ($self->canView) { unless ($self->canView) {
if ($self->get("state") eq "published") { # no privileges, make em log in if ($self->get("state") eq "published") { # no privileges, make em log in
return $self->session->privilege->noAccess(); return $self->session->privilege->noAccess();
} elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^trash/) { # show em trash } elsif ($self->session->var->isAdminOn && $self->get("state") =~ /^trash/) { # show em trash
$self->session->http->setRedirect($self->getUrl("func=manageTrash")); $self->session->http->setRedirect($self->getUrl("func=manageTrash"));
return undef; return undef;
} elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^clipboard/) { # show em clipboard } elsif ($self->session->var->isAdminOn && $self->get("state") =~ /^clipboard/) { # show em clipboard
$self->session->http->setRedirect($self->getUrl("func=manageClipboard")); $self->session->http->setRedirect($self->getUrl("func=manageClipboard"));
return undef; return undef;
} else { # tell em it doesn't exist anymore } else { # tell em it doesn't exist anymore

49
lib/WebGUI/Asset/Wobject/Navigation.pm
View file

@ -515,50 +515,6 @@ sub www_goBackToPage {
return undef; return undef;
} }
#-------------------------------------------------------------------
# we eventually should reaadd this
sub www_preview {
my $self = shift;
$self->session->var->get("adminOn") = 0;
return $self->session->privilege->insufficient() unless ($self->session->user->isAdmin);
my $nav = WebGUI::Navigation->new( depth=>$self->session->form->process("depth"),
method=>$self->session->form->process("method"),
startAt=>$self->session->form->process("startAt"),
stopAtLevel=>$self->session->form->process("stopAtLevel"),
templateId=>$self->session->form->process("templateId"),
showSystemPages=>$self->session->form->process("showSystemPages"),
showHiddenPages=>$self->session->form->process("showHiddenPages"),
showUnprivilegedPages=>$self->session->form->process("showUnprivilegedPages"),
'reverse'=>$self->session->form->process("'reverse'"),
);
my $output = qq(
<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr><td class="tableHeader" valign="top">
Configuration
</td><td class="tableHeader" valign="top">Output</td></tr>
<tr><td class="tableHeader" valign="top">
<font size=1>
Identifier: $self->session->form->process("identifier")<br />
startAt: $self->session->form->process("startAt")<br />
method: $self->session->form->process("method")<br />
stopAtLevel: $self->session->form->process("stopAtLevel")<br />
depth: $self->session->form->process("depth")<br />
templateId: $self->session->form->process("templateId")<br />
reverse: $self->session->form->process("'reverse'")<br />
showSystemPages: $self->session->form->process("showSystemPages")<br />
showHiddenPages: $self->session->form->process("showHiddenPages")<br />
showUnprivilegedPages: $self->session->form->process("showUnprivilegedPages")<br />
</font>
</td><td class="tableData" valign="top">
) . $nav->build . qq(</td></tr></table>);
# Because of the way the system is set up, the preview is cached. So let's remove it again...
WebGUI::Cache->new($self->session,$nav->{_identifier}.$self->session->asset->getId, "Navigation-".$self->session->config->getFilename)->delete;
return _submenu($output,"preview");
}
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_view =head2 www_view
@ -579,4 +535,7 @@ sub www_view {
$self->session->http->setMimeType($mimeType || 'text/html'); $self->session->http->setMimeType($mimeType || 'text/html');
return $self->view(); return $self->view();
} }
}1; }
1;

4
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -1855,7 +1855,7 @@ sub editThingData {
$field{value} = $fieldValue || $field{defaultValue}; $field{value} = $fieldValue || $field{defaultValue};
my $formElement .= $self->getFormElement(\%field); my $formElement .= $self->getFormElement(\%field);
my $hidden = ($field{status} eq "hidden" && !$self->session->var->get("adminOn")); my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn);
my $value = $field{value}; my $value = $field{value};
$value = $self->getFieldValue($value,\%field); $value = $self->getFieldValue($value,\%field);
@ -2697,7 +2697,7 @@ sub www_viewThingData {
sequenceNumber'); sequenceNumber');
while (my %field = $fields->hash) { while (my %field = $fields->hash) {
next unless ($field{display} eq '1'); next unless ($field{display} eq '1');
my $hidden = ($field{status} eq "hidden" && !$self->session->var->get("adminOn")); my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn);
my $originalValue = $thingData{"field_".$field{fieldId}}; my $originalValue = $thingData{"field_".$field{fieldId}};
my $dateCreated = $thingData{"dateCreated"}; my $dateCreated = $thingData{"dateCreated"};

2
lib/WebGUI/Macro/AdminText.pm
View file

@ -33,7 +33,7 @@ string is returned.
sub process { sub process {
my $session = shift; my $session = shift;
my @param = @_; my @param = @_;
return "" unless ($session->var->get("adminOn")); return "" unless ($session->var->isAdminOn);
return $param[0]; return $param[0];
} }

2
lib/WebGUI/Macro/EditableToggle.pm
View file

@ -55,7 +55,7 @@ sub process {
my $i18n = WebGUI::International->new($session,'Macro_EditableToggle'); my $i18n = WebGUI::International->new($session,'Macro_EditableToggle');
my $turnOn = $param[0] || $i18n->get(516); my $turnOn = $param[0] || $i18n->get(516);
my $turnOff = $param[1] || $i18n->get(517); my $turnOff = $param[1] || $i18n->get(517);
if ($session->var->get("adminOn")) { if ($session->var->isAdminOn) {
$var{'toggle.url'} = $session->url->page('op=switchOffAdmin'); $var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
$var{'toggle.text'} = $turnOff; $var{'toggle.text'} = $turnOff;
} else { } else {

2
lib/WebGUI/Operation/Shared.pm
View file

@ -38,7 +38,7 @@ TODO: DOCUMENT ME
if ($session->user->isInGroup(12)) { if ($session->user->isInGroup(12)) {
my %hash; my %hash;
if ($session->var->get("adminOn")) { if ($session->var->isAdminOn) {
$hash{'options.display'} .= '<a href="'.$session->url->page('op=switchOffAdmin').'">'.$i18n->get(12).'</a>'; $hash{'options.display'} .= '<a href="'.$session->url->page('op=switchOffAdmin').'">'.$i18n->get(12).'</a>';
} else { } else {
$hash{'options.display'} .= '<a href="'.$session->url->page('op=switchOnAdmin').'">'.$i18n->get(63).'</a>'; $hash{'options.display'} .= '<a href="'.$session->url->page('op=switchOnAdmin').'">'.$i18n->get(63).'</a>';