rewrote the template api and added lots of caching options
This commit is contained in:
parent
6613992f3d
commit
20482def49
24 changed files with 252 additions and 100 deletions
|
|
@ -68,7 +68,7 @@ sub www_viewMessageLog {
|
|||
$vars->{'message.multiplePages'} = ($p->getNumberOfPages > 1);
|
||||
$vars->{'message.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
|
||||
|
||||
return WebGUI::Template::process(WebGUI::Template::get(1,'Operation/MessageLog/View'), $vars);
|
||||
return WebGUI::Template::process(1,'Operation/MessageLog/View', $vars);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -95,7 +95,7 @@ sub www_viewMessageLogMessage {
|
|||
|
||||
$vars->{'message.text'} = $data->{message};
|
||||
$vars->{'message.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
|
||||
return WebGUI::Template::process(WebGUI::Template::get(1,'Operation/MessageLog/Message'), $vars);
|
||||
return WebGUI::Template::process(1,'Operation/MessageLog/Message', $vars);
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ sub www_editProfile {
|
|||
$vars->{'profile.form.elements'} = \@array;
|
||||
$vars->{'profile.form.submit'} = WebGUI::Form::submit({});
|
||||
$vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
|
||||
return WebGUI::Template::process(WebGUI::Template::get(1,'Operation/Profile/Edit'), $vars);
|
||||
return WebGUI::Template::process(1,'Operation/Profile/Edit', $vars);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -257,7 +257,7 @@ sub www_viewProfile {
|
|||
if ($session{user}{userId} == $session{form}{uid}) {
|
||||
$vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
|
||||
}
|
||||
return WebGUI::Template::process(WebGUI::Template::get(1,'Operation/Profile/View'), $vars);
|
||||
return WebGUI::Template::process(1,'Operation/Profile/View', $vars);
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -53,13 +53,11 @@ sub _submenu {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_copyTemplate {
|
||||
my (%template);
|
||||
if (WebGUI::Grouping::isInGroup(8)) {
|
||||
%template = WebGUI::SQL->quickHash("select * from template where templateId=$session{form}{tid} and namespace=".quote($session{form}{namespace}));
|
||||
WebGUI::SQL->write("insert into template (templateId,name,template,namespace)
|
||||
values ("._getNextTemplateId($session{form}{namespace}).",
|
||||
".quote('Copy of '.$template{name}).", ".quote($template{template}).",
|
||||
".quote($template{namespace}).")");
|
||||
my $template = WebGUI::Template::get($session{form}{tid},$session{form}{namespace});
|
||||
$template->{name} .= " (copy)";
|
||||
$template->{templateId} = "new";
|
||||
WebGUI::Template::set($template);
|
||||
return www_listTemplates();
|
||||
} else {
|
||||
return WebGUI::Privilege::adminOnly();
|
||||
|
|
@ -157,17 +155,15 @@ sub www_editTemplate {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_editTemplateSave {
|
||||
if (WebGUI::Grouping::isInGroup(8)) {
|
||||
if ($session{form}{tid} eq "new") {
|
||||
$session{form}{tid} = _getNextTemplateId($session{form}{namespace});
|
||||
WebGUI::SQL->write("insert into template (templateId,namespace) values
|
||||
($session{form}{tid}, ".quote($session{form}{namespace}).")");
|
||||
}
|
||||
if ($session{form}{template} eq "" && $session{form}{namespace} eq "Page") {
|
||||
$session{form}{template} = "<table>\n<tr>\n<td>\n\n<tmpl_var page.position1>\n\n</td>\n </tr>\n</table>\n";
|
||||
}
|
||||
WebGUI::SQL->write("update template set name=".quote($session{form}{name}).",
|
||||
template=".quote($session{form}{template})."
|
||||
where templateId=".$session{form}{tid}." and namespace=".quote($session{form}{namespace}));
|
||||
$session{form}{tid} = WebGUI::Template::set({
|
||||
templateId=>$session{form}{tid},
|
||||
namespace=>$session{form}{namespace},
|
||||
name=>$session{form}{name},
|
||||
template=>$session{form}{template}
|
||||
});
|
||||
if ($session{form}{action2} eq "") {
|
||||
return www_listTemplates();
|
||||
} else {
|
||||
|
|
@ -209,20 +205,5 @@ sub www_listTemplates {
|
|||
}
|
||||
}
|
||||
|
||||
sub _getNextTemplateId {
|
||||
my $namespace = shift;
|
||||
my $templateId;
|
||||
my $query = "select max(templateId) from template";
|
||||
if ($namespace) {
|
||||
$query .= " where namespace = ".quote($namespace);
|
||||
}
|
||||
($templateId) = WebGUI::SQL->quickArray($query);
|
||||
if ($templateId > 999) {
|
||||
$templateId++;
|
||||
} else {
|
||||
$templateId = 1000;
|
||||
}
|
||||
return $templateId;
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue