fixed: some default assets have ids shorter than 22 characters

This commit is contained in:
Graham Knop 2008-10-02 15:12:20 +00:00
parent 05a01201ff
commit f7b02c0407
6 changed files with 31 additions and 5 deletions

View file

@ -2,6 +2,7 @@
- changed: the list of extensions for the export system to pass through - changed: the list of extensions for the export system to pass through
unmodified has been moved to the configuration file under the unmodified has been moved to the configuration file under the
"exportBianryExtensions" field. "exportBianryExtensions" field.
- fixed: some default assets have ids shorter than 22 characters
7.6.0 7.6.0
- added: users may now customize the post received page for the CS - added: users may now customize the post received page for the CS

View file

@ -27,7 +27,10 @@ my $quiet; # this line required
my $session = start(); # this line required my $session = start(); # this line required
addExportExtensionsToConfigFile($session); addExportExtensionsToConfigFile($session);
fixShortAssetIds( $session );
finish($session); # this line required finish($session); # this line required
@ -36,7 +39,7 @@ finish($session); # this line required
# this system received a backport, leave the field as is. # this system received a backport, leave the field as is.
sub addExportExtensionsToConfigFile { sub addExportExtensionsToConfigFile {
my $session = shift; my $session = shift;
print "Adding binary export extensions to config file... " unless $quiet;
# skip if the field has been defined already by backporting # skip if the field has been defined already by backporting
return if defined $session->config->get('exportBinaryExtensions'); return if defined $session->config->get('exportBinaryExtensions');
@ -45,8 +48,30 @@ sub addExportExtensionsToConfigFile {
[ qw/.html .htm .txt .pdf .jpg .css .gif .png .doc .xls .xml .rss .bmp [ qw/.html .htm .txt .pdf .jpg .css .gif .png .doc .xls .xml .rss .bmp
.mp3 .js .fla .flv .swf .pl .php .php3 .php4 .php5 .ppt .docx .zip .tar .mp3 .js .fla .flv .swf .pl .php .php3 .php4 .php5 .ppt .docx .zip .tar
.rar .gz .bz2/ ] ); .rar .gz .bz2/ ] );
print "Done.\n" unless $quiet;
} }
sub fixShortAssetIds {
print "Fixing assets with short ids... " unless $quiet;
my %assetIds = (
'default_post_received' => 'default_post_received1',
'SQLReportDownload0001' => 'SQLReportDownload00001',
'UserListTmpl0000001' => 'UserListTmpl0000000001',
'UserListTmpl0000002' => 'UserListTmpl0000000002',
'UserListTmpl0000003' => 'UserListTmpl0000000003',
);
while (my ($fromId, $toId) = each %assetIds) {
$session->db->write('UPDATE `template` SET `assetId`=? WHERE `assetId`=?', [$toId, $fromId]);
$session->db->write('UPDATE `assetData` SET `assetId`=? WHERE `assetId`=?', [$toId, $fromId]);
$session->db->write('UPDATE `asset` SET `assetId`=? WHERE `assetId`=?', [$toId, $fromId]);
$session->db->write('UPDATE `assetIndex` SET `assetId`=? WHERE `assetId`=?', [$toId, $fromId]);
$session->db->write('UPDATE `template` SET `assetId`=? WHERE `assetId`=?', [$toId, $fromId]);
$session->db->write('UPDATE `Collaboration` SET `postReceivedTemplateId`=? WHERE `postReceivedTemplateId`=?', [$toId, $fromId]);
$session->db->write('UPDATE `UserList` SET `templateId`=? WHERE `templateId`=?', [$toId, $fromId]);
$session->db->write('UPDATE `SQLReport` SET `downloadTemplateId`=? WHERE `downloadTemplateId`=?', [$toId, $fromId]);
}
print "Done.\n" unless $quiet;
}
# -------------- DO NOT EDIT BELOW THIS LINE -------------------------------- # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------

View file

@ -783,11 +783,11 @@ sub definition {
}, },
postReceivedTemplateId =>{ postReceivedTemplateId =>{
fieldType=>'template', fieldType=>'template',
namespace=>'Collaboration', namespace=>'Collaboration/PostReceived',
tab=>'display', tab=>'display',
label=>$i18n->get('post received template'), label=>$i18n->get('post received template'),
hoverHelp=>$i18n->get('post received template hoverHelp'), hoverHelp=>$i18n->get('post received template hoverHelp'),
defaultValue=>'default_post_received', defaultValue=>'default_post_received1',
}, },
); );

View file

@ -166,7 +166,7 @@ sub definition {
}, },
downloadTemplateId=>{ downloadTemplateId=>{
fieldType=>"template", fieldType=>"template",
defaultValue=>'SQLReportDownload0001', defaultValue=>'SQLReportDownload00001',
}, },
downloadMimeType=>{ downloadMimeType=>{
fieldType=>"text", fieldType=>"text",

View file

@ -167,7 +167,7 @@ sub definition {
%properties = ( %properties = (
templateId =>{ templateId =>{
fieldType=>"template", fieldType=>"template",
defaultValue=>'UserListTmpl0000001', defaultValue=>'UserListTmpl0000000001',
namespace=>'UserList', namespace=>'UserList',
tab=>"display", tab=>"display",
hoverHelp=>$i18n->get("template description"), hoverHelp=>$i18n->get("template description"),