public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed data keys from table custom_forms

Browse source
This commit is contained in:
witzig 2017-03-20 21:25:41 +01:00
parent c3ee53bd4b
commit f2b7d4c8df
2 changed files with 6 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/models/forms.js
View file

@ -153,7 +153,7 @@ module.exports.create = (listId, form, callback) => {
let done = err => {
jobs--;
error = err ? err : error; // One's enough
jobs === 0 && callback(error, formId)
jobs === 0 && callback(error, formId);
};
filtered = filterKeysAndValues(keys, values, 'include', ['mail_', 'web_']);
@ -166,27 +166,13 @@ module.exports.create = (listId, form, callback) => {
return done(err);
}
connection.query('INSERT INTO custom_forms_data (form, data_key, data_value) VALUES (?, ?, ?)', [formId, key, filtered.values[index]], (err, result) => {
connection.query('INSERT INTO custom_forms_data (form, data_key, data_value) VALUES (?, ?, ?)', [formId, key, filtered.values[index]], err => {
connection.release();
if (err) {
connection.release();
return done(err);
}
let dataId = result && result.insertId;
if (!dataId) {
connection.release();
return done(new Error('Invalid custom_forms_data insertId'));
}
connection.query('UPDATE custom_forms SET `' + key + '`=? WHERE id=?', [dataId, formId], (err, result) => {
connection.release();
if (err) {
return done(err);
}
return done(null);
});
return done(null);
});
});
});
@ -273,7 +259,7 @@ module.exports.update = (id, updates, callback) => {
return done(err);
}
connection.query('UPDATE custom_forms_data SET data_value=? WHERE data_key=? AND form=?', [filtered.values[index], key, id], (err, result) => {
connection.query('UPDATE custom_forms_data SET data_value=? WHERE data_key=? AND form=?', [filtered.values[index], key, id], err => {
connection.release();
if (err) {
return done(err);
@ -313,8 +299,8 @@ module.exports.delete = (formId, callback) => {
}
connection.query('DELETE FROM custom_forms WHERE id=? LIMIT 1', [formId], err => {
connection.release();
if (err) {
connection.release();
return callback(err);
}
return callback(null, true);

14
setup/sql/upgrade-00022.sql
View file

@ -12,20 +12,6 @@ CREATE TABLE `custom_forms` (
`fields_shown_on_manage` varchar(255) DEFAULT '',
`layout` longtext,
`form_input_style` longtext,
`mail_confirm_html` int(11) unsigned DEFAULT NULL,
`mail_confirm_text` int(11) unsigned DEFAULT NULL,
`mail_subscription_confirmed_html` int(11) unsigned DEFAULT NULL,
`mail_subscription_confirmed_text` int(11) unsigned DEFAULT NULL,
`mail_unsubscribe_confirmed_html` int(11) unsigned DEFAULT NULL,
`mail_unsubscribe_confirmed_text` int(11) unsigned DEFAULT NULL,
`web_confirm_notice` int(11) unsigned DEFAULT NULL,
`web_manage_address` int(11) unsigned DEFAULT NULL,
`web_manage` int(11) unsigned DEFAULT NULL,
`web_subscribe` int(11) unsigned DEFAULT NULL,
`web_subscribed` int(11) unsigned DEFAULT NULL,
`web_unsubscribe_notice` int(11) unsigned DEFAULT NULL,
`web_unsubscribe` int(11) unsigned DEFAULT NULL,
`web_updated_notice` int(11) unsigned DEFAULT NULL,
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
KEY `list` (`list`),