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

DataForm rewritten

Browse source
This commit is contained in:
Graham Knop 2008-06-11 19:27:23 +00:00
parent e1527b5fda
commit 8b752dd64e
3 changed files with 1087 additions and 989 deletions
Download patch file Download diff file Expand all files Collapse all files

96
docs/upgrades/upgrade_7.5.10-7.5.11.pl
View file

@ -80,9 +80,105 @@ addInheritUrlFromParent( $session );
addDefaultFilesPerPage( $session ); addDefaultFilesPerPage( $session );
fixAdminConsoleTemplateTitles( $session ); fixAdminConsoleTemplateTitles( $session );
removeOldCommerceCode($session); removeOldCommerceCode($session);
convertDataForm( $session );
finish($session); # this line required finish($session); # this line required
#----------------------------------------------------------------------------
sub convertDataForm {
my $session = shift;
print "\tConverting DataForm configuration and data to JSON..." unless $quiet;
$session->db->write(
q{ ALTER TABLE `DataForm` ADD COLUMN storeData INT(1) DEFAULT 1 },
);
$session->db->write(
q{ ALTER TABLE `DataForm` ADD COLUMN fieldConfiguration TEXT },
);
$session->db->write(
q{ ALTER TABLE `DataForm` ADD COLUMN tabConfiguration TEXT },
);
$session->db->write(
q{ ALTER TABLE `DataForm_entry` ADD COLUMN entryData TEXT },
);
my @dataforms = $session->db->buildArray("SELECT `assetId` FROM `asset` WHERE className='WebGUI::Asset::Wobject::DataForm'");
for my $assetId (@dataforms) {
my $dataForm = WebGUI::Asset->newPending($session, $assetId);
my @tabConfigs;
my $tabs = $session->db->read("SELECT * FROM DataForm_tab WHERE assetId=? ORDER BY sequenceNumber", [$assetId]);
while (my $tabData = $tabs->hashRef) {
my $newConfig = {
label => $tabData->{label},
subtext => $tabData->{subtext},
tabId => $tabData->{DataForm_tabId},
};
push @tabConfigs, $newConfig;
}
$tabs->finish;
my $tabJSON = encode_json( \@tabConfigs );
my @fieldConfigs;
my %fieldMapping;
my $fields = $session->db->read("SELECT * FROM `DataForm_field` WHERE assetId=? ORDER BY sequenceNumber", [$assetId]);
while (my $fieldData = $fields->hashRef) {
my $newConfig = {
name => $fieldData->{name},
status => $fieldData->{status},
type => "\u$fieldData->{type}",
possibleValues => $fieldData->{possibleValues},
defaultValue => $fieldData->{defaultValue},
width => $fieldData->{width},
subtext => $fieldData->{subtext},
rows => $fieldData->{rows},
isMailField => $fieldData->{isMailField},
label => $fieldData->{label},
tabId => $fieldData->{DataForm_tabId} || undef,
vertical => $fieldData->{vertical},
extras => $fieldData->{extras},
};
$fieldMapping{ $fieldData->{DataForm_fieldId} } = $newConfig->{name};
push @fieldConfigs, $newConfig;
}
$fields->finish;
my $fieldJSON = encode_json( \@fieldConfigs );
my $entries = $session->db->read("SELECT * FROM `DataForm_entry` WHERE assetId=?", [$assetId]);
while (my $entryData = $entries->hashRef) {
my $newEntryFieldData = {};
my $entryFields = $session->db->read("SELECT * FROM `DataForm_entryData` WHERE assetId=? AND DataForm_entryId=?", [$assetId, $entryData->{DataForm_entryId}]);
while (my $entryFieldData = $entryFields->hashRef) {
$newEntryFieldData->{ $fieldMapping{ $entryFieldData->{DataForm_fieldId} } } = $entryData->{value};
}
$entryFields->finish;
my $entryJSON = encode_json($newEntryFieldData);
$session->db->write("UPDATE `DataForm_entry` SET entryData=? WHERE assetId=? AND DataForm_entryId=?", [$entryJSON, $assetId, $entryData->{DataForm_entryId}]);
}
$entries->finish;
$dataForm->addRevision({fieldConfiguration => $fieldJSON, tabConfiguration => $tabJSON});
}
$session->db->write(
q{ ALTER TABLE `DataForm_entry` ADD COLUMN newDate DATETIME },
);
$session->db->write(
q{ UPDATE `DataForm_entry` SET newDate = FROM_UNIXTIME(submissionDate) },
);
$session->db->write(
q{ ALTER TABLE `DataForm_entry` DROP COLUMN submissionDate },
);
$session->db->write(
q{ ALTER TABLE `DataForm_entry` CHANGE COLUMN newDate submissionDate DATETIME },
);
$session->db->write(
q{ DROP TABLE `DataForm_tab` },
);
$session->db->write(
q{ DROP TABLE `DataForm_field` },
);
$session->db->write(
q{ DROP TABLE `DataForm_entryData` },
);
print "Done.\n" unless $quiet;
}
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Add default files per page to the Gallery # Add default files per page to the Gallery
sub addDefaultFilesPerPage { sub addDefaultFilesPerPage {

1970
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

File diff suppressed because it is too large Load diff

10
lib/WebGUI/i18n/English/Asset_DataForm.pm
View file

@ -980,6 +980,16 @@ be useful, others may not.|,
context => q{Description of asset property}, context => q{Description of asset property},
}, },
'store data' => {
message => 'Store Data',
lastUpdated => 0,
},
'store data description' => {
message => 'Whether to store submitted data',
lastUpdated => 0,
},
'helpvar useCaptcha' => { 'helpvar useCaptcha' => {
message => q{This variable is true when the CAPTCHA should be shown.}, message => q{This variable is true when the CAPTCHA should be shown.},
lastUpdated => 0, lastUpdated => 0,