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

a few forgotten details of updating page templates and style templates

Browse source
This commit is contained in:
JT Smith 2003-11-28 20:44:34 +00:00
parent e6b52775dd
commit ca59a02d3c
4 changed files with 154 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
docs/upgrades/upgrade_5.5.3-6.0.0.pl
View file

@ -50,6 +50,19 @@ $sth->finish;
WebGUI::SQL->write("delete from incrementer where incrementerId='styleId'");
WebGUI::SQL->write("delete from settings where name='docTypeDec'");
WebGUI::SQL->write("drop table style");
my @templateManagers = WebGUI::SQL->buildArray("select userId from groupings where groupId=8");
my $clause;
if ($#templateManagers > 0) {
$clause = "and userId not in (".join(",",@templateManagers).")";
}
$sth = WebGUI::SQL->read("select userId,expireDate,groupAdmin from groupings where groupId=5 ".$clause);
while (my $user = $sth->hashRef) {
WebGUI::SQL->write("insert into groupings (groupId,userId,expireDate,groupAdmin) values (8, ".$user->{userId}.",
".$user->{expireDate}.", ".$user->{groupAdmin}.")");
}
$sth->finish;
WebGUI::SQL->write("delete from groups where groupId=5");
WebGUI::SQL->write("delete from groupings where groupId=5");
#--------------------------------------------
@ -67,7 +80,7 @@ while (my $template = $sth->hashRef) {
</style>
</tmpl_if>
<tmpl_if session.var.adminOn> <tmpl_if page.canEdit>
<tmpl_var page.toolbar>
<tmpl_var page.controls>
</tmpl_if> </tmpl_if>
'.$template->{template};
$template->{template} =~ s/\<tmpl_var page\.position(\d+)\>/_positionFormat6x($1)/eg;
@ -110,7 +123,7 @@ sub _positionFormat6x {
<tmpl_if wobject.canView>
<div class="wobject"> <div class="wobject<tmpl_var wobject.namespace>" id="wobjectId<tmpl_var wobject.id>">
<tmpl_if session.var.adminOn> <tmpl_if wobject.canEdit>
<tmpl_var wobject.toolbar>
<tmpl_var wobject.controls>
</tmpl_if> </tmpl_if>
<tmpl_if wobject.isInDateRange>
<a name="<tmpl_var wobject.id>"></a>

137
docs/upgrades/upgrade_5.5.3-6.0.0.sql
View file

File diff suppressed because one or more lines are too long

6
lib/WebGUI/Macro/AdminBar.pm
View file

@ -126,12 +126,6 @@ sub process {
%hash
);
}
if (WebGUI::Privilege::isInGroup(5)) {
%hash = (
WebGUI::URL::page('op=listStyles')=>WebGUI::International::get(6),
%hash
);
}
if (WebGUI::Privilege::isInGroup(6)) {
%hash = (
WebGUI::URL::gateway('packages')=>WebGUI::International::get(374),

4
lib/WebGUI/Page.pm
View file

@ -178,7 +178,7 @@ sub generate {
return WebGUI::Privilege::noAccess() unless (WebGUI::Privilege::canViewPage());
my %var;
$var{'page.canEdit'} = WebGUI::Privilege::canEditPage();
$var{'page.toolbar'} = pageIcon()
$var{'page.controls'} = pageIcon()
.deleteIcon('op=deletePage')
.editIcon('op=editPage')
.moveUpIcon('op=movePageUp')
@ -229,7 +229,7 @@ sub generate {
push(@{$var{'position'.$wobject->{templatePosition}.'_loop'}},{
'wobject.canView'=>WebGUI::Privilege::canViewWobject($wobject->{wobjectId}),
'wobject.canEdit'=>WebGUI::Privilege::canEditWobject($wobject->{wobjectId}),
'wobject.toolbar'=>$wobjectToolbar,
'wobject.controls'=>$wobjectToolbar,
'wobject.namespace'=>$wobject->{namespace},
'wobject.id'=>$wobject->{wobjectId},
'wobject.isInDateRange'=>$w->inDateRange,