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

Merge pull request #482 from ateuber/custom_field_description

Browse source 
Custom field description
This commit is contained in:
Tomas Bures 2019-03-09 09:04:38 +01:00 • committed by GitHub
commit fa1bf1c874
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/models/fields.js
View file

@ -9,7 +9,7 @@ let Handlebars = require('handlebars');
let _ = require('../translate')._;
let util = require('util');
let allowedKeys = ['name', 'key', 'default_value', 'group', 'group_template', 'visible'];
let allowedKeys = ['name', 'description', 'key', 'default_value', 'group', 'group_template', 'visible'];
let allowedTypes;
module.exports.grouped = ['radio', 'checkbox', 'dropdown'];
@ -133,10 +133,11 @@ module.exports.create = (listId, field, callback) => {
field.group = null;
}
field.description = (field.description || '').toString().trim() || null;
field.defaultValue = (field.defaultValue || '').toString().trim() || null;
field.groupTemplate = (field.groupTemplate || '').toString().trim() || null;
addCustomField(listId, field.name, field.defaultValue, field.type, field.group, field.groupTemplate, field.visible, callback);
addCustomField(listId, field.name, field.description, field.defaultValue, field.type, field.group, field.groupTemplate, field.visible, callback);
};
module.exports.update = (id, updates, callback) => {
@ -157,6 +158,7 @@ module.exports.update = (id, updates, callback) => {
updates.key = slugify(updates.key, '_').toUpperCase();
}
updates.description = (updates.description || '').toString().trim() || null;
updates.defaultValue = (updates.defaultValue || '').toString().trim() || null;
updates.groupTemplate = (updates.groupTemplate || '').toString().trim() || null;
@ -277,7 +279,7 @@ module.exports.delete = (fieldId, callback) => {
});
};
function addCustomField(listId, name, defaultValue, type, group, groupTemplate, visible, callback) {
function addCustomField(listId, name, description, defaultValue, type, group, groupTemplate, visible, callback) {
type = (type || '').toString().trim().toLowerCase();
group = Number(group) || null;
listId = Number(listId) || 0;
@ -314,8 +316,8 @@ function addCustomField(listId, name, defaultValue, type, group, groupTemplate,
column = ('custom_' + slugify(name, '_') + '_' + shortid.generate()).toLowerCase().replace(/[^a-z0-9_]/g, '');
}
let query = 'INSERT INTO custom_fields (`list`, `name`, `key`,`default_value`, `type`, `group`, `group_template`, `column`, `visible`) VALUES(?,?,?,?,?,?,?,?,?)';
connection.query(query, [listId, name, key, defaultValue, type, group, groupTemplate, column, visible ? 1 : 0], (err, result) => {
let query = 'INSERT INTO custom_fields (`list`, `name`, `description`, `key`,`default_value`, `type`, `group`, `group_template`, `column`, `visible`) VALUES(?,?,?,?,?,?,?,?,?,?)';
connection.query(query, [listId, name, description, key, defaultValue, type, group, groupTemplate, column, visible ? 1 : 0], (err, result) => {
if (err) {
connection.release();
@ -409,6 +411,7 @@ module.exports.getRow = (fieldList, values, useDate, showAll, onlyExisting) => {
id: field.id,
type: field.type,
name: field.name,
description: field.description,
column: field.column,
value: (valueList[field.column] || '').toString().trim(),
visible: !!field.visible,
@ -439,6 +442,7 @@ module.exports.getRow = (fieldList, values, useDate, showAll, onlyExisting) => {
id: field.id,
type: field.type,
name: field.name,
description: field.description,
column: field.column,
value: (valueList[field.column] || '').toString().trim(),
visible: !!field.visible,
@ -455,6 +459,7 @@ module.exports.getRow = (fieldList, values, useDate, showAll, onlyExisting) => {
id: field.id,
type: field.type,
name: field.name,
description: field.description,
column: field.column,
value: Number(valueList[field.column]) || 0,
visible: !!field.visible,
@ -474,6 +479,7 @@ module.exports.getRow = (fieldList, values, useDate, showAll, onlyExisting) => {
id: field.id,
type: field.type,
name: field.name,
description: field.description,
visible: !!field.visible,
key: 'group-g' + field.id,
mergeTag: field.key,
@ -495,6 +501,7 @@ module.exports.getRow = (fieldList, values, useDate, showAll, onlyExisting) => {
return {
type: subField.type,
name: subField.name,
description: subField.description,
column: subField.column,
value: valueList[subField.column] ? 1 : 0,
visible: !!subField.visible,
@ -572,6 +579,7 @@ module.exports.getRow = (fieldList, values, useDate, showAll, onlyExisting) => {
id: field.id,
type: field.type,
name: field.name,
description: field.description,
column: field.column,
value: useDate ? value : formatted,
visible: !!field.visible,