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

fixed version tag problem. changed admin toggle

Browse source
This commit is contained in:
Doug Bell 2010-05-07 13:03:05 -05:00
parent ea1a020ab5
commit 5c2581850f
6 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Admin.pm
View file

@ -327,7 +327,7 @@ __DATA__
<dt class="a-m-t">^International("admin console","AdminConsole");</dt>
<dd class="a-m-d"><div class="bd">
<TMPL_LOOP adminPlugins>
<a class="link" href="<tmpl_var url>">
<a class="link" target="view" href="<tmpl_var url>">
<img src="<tmpl_var icon.small>" style="border: 0px; vertical-align: middle;" alt="icon" />
<tmpl_var title>
</a>

8
lib/WebGUI/Asset.pm
View file

@ -1042,7 +1042,7 @@ sub getHelpers {
my ( $self ) = @_;
my $default = [
{
{
class => 'WebGUI::AssetHelper::EditBranch',
label => 'Edit Branch',
},
@ -2059,6 +2059,8 @@ sub processEditForm {
my $overrides = $self->session->config->get( "assets/" . $self->get("className") . "/fields" );
foreach my $property ( $self->getProperties ) {
next if $self->meta->find_attribute_by_name( $property )->noFormPost;
my $fieldType = $self->meta->find_attribute_by_name($property)->fieldType;
my $fieldOverrides = $overrides->{$property} || {};
my $fieldHash = {
@ -2069,7 +2071,6 @@ sub processEditForm {
value => $self->$property,
};
next if ( $fieldHash->{noFormPost} );
# process the form element
$data{$property} = $form->process( $property, $fieldType, $fieldHash->{defaultValue}, $fieldHash );
@ -2084,6 +2085,9 @@ sub processEditForm {
$self->updateMetaData( $field, $value );
}
}
$self->session->log->info( Dumper \%data );
$self->session->db->beginTransaction;
$self->update( \%data );
$self->session->db->commit;

2
lib/WebGUI/Macro.pm
View file

@ -43,7 +43,7 @@ These functions are available from this package:
=cut
#-------------------------------------------------------------------
my $macro_re = qr{
our $macro_re = qr{
( # capture #1 - entire macro call
\^ # start with carat
([-a-zA-Z0-9_@#/*]{1,64}) # capture #2 - macro name

9
lib/WebGUI/Macro/AdminToggle.pm
View file

@ -48,16 +48,15 @@ sub process {
my $session = shift;
return ""
unless $session->user->canUseAdminMode;
my ($turnOn, $turnOff, $templateName) = @_;
my ($turnOn, $templateName) = @_;
my $i18n = WebGUI::International->new($session,'Macro_AdminToggle');
my %var;
$var{'toggle.text'} = $turnOn || $i18n->get(516);
if ($session->var->isAdminOn) {
$var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
$var{'toggle.text'} = $turnOff || $i18n->get(517);
$var{'toggle.url'} = '#'
}
else {
$var{'toggle.url'} = $session->url->page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn || $i18n->get(516);
$var{'toggle.url'} = $session->url->page('op=admin');
}
my $template = $templateName ? WebGUI::Asset::Template->newByUrl($session, $templateName)
: WebGUI::Asset::Template->newById($session, "PBtmpl0000000000000036");