From 97bb700334557d240f9bbd91f97675e3bb6d657b Mon Sep 17 00:00:00 2001
From: Tomas Bures <tbures@sathyasai.org>
Date: Sat, 9 Mar 2019 07:42:14 +0000
Subject: [PATCH] Various fixes

---
 client/src/lists/CUD.js                 | 2 +-
 client/src/lists/forms/CUD.js           | 6 ++++--
 mvis/ivis-core                          | 2 +-
 server/lib/subscription-mail-helpers.js | 2 +-
 server/routes/subscription.js           | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/src/lists/CUD.js b/client/src/lists/CUD.js
index 4096162e..86a3ab3c 100644
--- a/client/src/lists/CUD.js
+++ b/client/src/lists/CUD.js
@@ -277,7 +277,7 @@ export default class CUD extends Component {
                     <Dropdown id="form" label={t('forms')} options={formsOptions} help={t('webAndEmailFormsAndTemplatesUsedIn')}/>
 
                     {this.getFormValue('form') === 'custom' &&
-                        <TableSelect id="default_form" label={t('customForms')} withHeader dropdown dataUrl='rest/forms-table' columns={customFormsColumns} selectionLabelIndex={1} help={<Trans i18nKey="theCustomFormUsedForThisListYouCanCreate">The custom form used for this list. You can create a form <a href={`/lists/forms/create/${this.props.entity.id}`}>here</a>.</Trans>}/>
+                        <TableSelect id="default_form" label={t('customForms')} withHeader dropdown dataUrl='rest/forms-table' columns={customFormsColumns} selectionLabelIndex={1} help={<Trans i18nKey="theCustomFormUsedForThisListYouCanCreate">The custom form used for this list. You can create a form <a href={`/lists/forms/create`}>here</a>.</Trans>}/>
                     }
 
                     <CheckBox id="public_subscribe" label={t('subscription')} text={t('allowPublicUsersToSubscribeThemselves')}/>
diff --git a/client/src/lists/forms/CUD.js b/client/src/lists/forms/CUD.js
index 872a0e4c..a4cca350 100644
--- a/client/src/lists/forms/CUD.js
+++ b/client/src/lists/forms/CUD.js
@@ -311,13 +311,15 @@ export default class CUD extends Component {
     }
 
     getFormValuesMutator(data) {
-        data.selectedTemplate = 'layout';
         this.supplyDefaults(data);
     }
 
     componentDidMount() {
         if (this.props.entity) {
-            this.getFormValuesFromEntity(this.props.entity, ::this.getFormValuesMutator);
+            this.getFormValuesFromEntity(this.props.entity, data => {
+                this.getFormValuesMutator(data);
+                data.selectedTemplate = 'layout';
+            });
 
         } else {
             const data = {
diff --git a/mvis/ivis-core b/mvis/ivis-core
index f0167635..4d53d4b0 160000
--- a/mvis/ivis-core
+++ b/mvis/ivis-core
@@ -1 +1 @@
-Subproject commit f0167635c8c238e828b311fa9d0b058b5a00020d
+Subproject commit 4d53d4b030273f25062fcc3c2328987d5a39cffc
diff --git a/server/lib/subscription-mail-helpers.js b/server/lib/subscription-mail-helpers.js
index 38ad6949..27395e00 100644
--- a/server/lib/subscription-mail-helpers.js
+++ b/server/lib/subscription-mail-helpers.js
@@ -129,7 +129,7 @@ async function _sendMail(list, email, template, locale, subjectKey, relativeUrls
     };
 
     if (list.default_form) {
-        const form = await forms.getById(contextHelpers.getAdminContext(), list.default_form);
+        const form = await forms.getById(contextHelpers.getAdminContext(), list.default_form, false);
 
         text.template = form['mail_' + template + '_text'] || text.template;
         html.template = form['mail_' + template + '_html'] || html.template;
diff --git a/server/routes/subscription.js b/server/routes/subscription.js
index b37dea8b..9ed8fd80 100644
--- a/server/routes/subscription.js
+++ b/server/routes/subscription.js
@@ -675,7 +675,7 @@ async function webNotice(type, req, res) {
         }
     };
 
-    await injectCustomFormData(req.query.fid || list.default_form, 'web_' + type + '_notice', data);
+    await injectCustomFormData(req.query.fid || list.default_form, 'web_' + type.replace('-', '_') + '_notice', data);
 
     const htmlRenderer = await tools.getTemplate(data.template, req.locale);