Revert "Rename template variables in the Account and Admin Toggle templates to not use underscores."
This reverts commit 0b4e8d5460.
This commit is contained in:
parent
9ddc54be42
commit
1b9edbf545
8 changed files with 9 additions and 85 deletions
|
|
@ -107,7 +107,7 @@ sub repackTemplates {
|
|||
template => $asset->get('template'),
|
||||
});
|
||||
}
|
||||
print "\t... DONE!\n" unless $quiet;
|
||||
print "DONE!\n" unless $quiet;
|
||||
|
||||
print "\tRepacking head tags in all assets, this may take a while..." unless $quiet;
|
||||
$sth = $session->db->read( "SELECT assetId, revisionDate FROM assetData where usePackedHeadTags=1" );
|
||||
|
|
@ -118,7 +118,7 @@ sub repackTemplates {
|
|||
extraHeadTags => $asset->get('extraHeadTags'),
|
||||
});
|
||||
}
|
||||
print "\t... DONE!\n" unless $quiet;
|
||||
print "DONE!\n" unless $quiet;
|
||||
|
||||
print "\tRepacking all snippets, this may take a while..." unless $quiet;
|
||||
$sth = $session->db->read( "SELECT assetId, revisionDate FROM snippet" );
|
||||
|
|
@ -130,50 +130,10 @@ sub repackTemplates {
|
|||
});
|
||||
}
|
||||
|
||||
print "\t... DONE!\n" unless $quiet;
|
||||
print "DONE!\n" unless $quiet;
|
||||
}
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Rename template variables
|
||||
sub renameAccountMacroTemplateVariables {
|
||||
my $session = shift;
|
||||
|
||||
print "\tRename Account Macro template variables..." unless $quiet;
|
||||
my $sth = $session->db->read( q|SELECT assetId, revisionDate FROM template where namespace="Macro/a_account"| );
|
||||
while ( my ($assetId, $revisionDate) = $sth->array ) {
|
||||
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId, $revisionDate );
|
||||
next unless $asset;
|
||||
my $template = $asset->get('template');
|
||||
$template =~ s/account\.url/account_url/msg;
|
||||
$template =~ s/account\.text/account_text/msg;
|
||||
$asset->update({
|
||||
template => $template,
|
||||
});
|
||||
}
|
||||
print "\t... DONE!\n" unless $quiet;
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Rename template variables
|
||||
sub renameAdminToggleMacroTemplateVariables {
|
||||
my $session = shift;
|
||||
|
||||
print "\tRename Admin Toggle Macro template variables..." unless $quiet;
|
||||
my $sth = $session->db->read( q|SELECT assetId, revisionDate FROM template where namespace="Macro/AdminToggle"| );
|
||||
while ( my ($assetId, $revisionDate) = $sth->array ) {
|
||||
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId, $revisionDate );
|
||||
next unless $asset;
|
||||
my $template = $asset->get('template');
|
||||
$template =~ s/toggle\.url/toggle_url/msg;
|
||||
$template =~ s/toggle\.text/toggle_text/msg;
|
||||
$asset->update({
|
||||
template => $template,
|
||||
});
|
||||
}
|
||||
print "\t... DONE!\n" unless $quiet;
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Describe what our function does
|
||||
#sub exampleFunction {
|
||||
|
|
@ -237,8 +197,6 @@ sub finish {
|
|||
my $session = shift;
|
||||
updateTemplates($session);
|
||||
repackTemplates( $session );
|
||||
renameAccountMacroTemplateVariables( $session );
|
||||
renameAdminToggleMacroTemplateVariables( $session );
|
||||
my $versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
$versionTag->commit;
|
||||
$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue