Use globals object in database rather than /_config/globals.json everywhere

[ndcode_site.git] / api / feedback.json.jst

diff --git a/api/feedback.json.jst b/api/feedback.json.jst
index 400c284..8d6f201 100644 (file)
--- a/api/feedback.json.jst
+++ b/api/feedback.json.jst
@@ -1,7 +1,6 @@
 let XDate = require('xdate')
 
 return async env => {
-  let globals = await env.site.get_json('/_config/globals.json')
   let nodemailer_feedback = await env.site.get_nodemailer(
     '/_config/nodemailer_feedback.json'
   )
@@ -24,9 +23,15 @@ return async env => {
         )
 
       let transaction = await env.site.database.Transaction()
+      let feedback_from, feedback_to
       try {
         // initialize env.session_key, set cookie in env.response
         await session_cookie(env, transaction)
+
+        let globals = await (await transaction.get({})).get('globals')
+        feedback_from = await globals.get_json('feedback_from')
+        feedback_to = await globals.get_json('feedback_to')
+
         await transaction.commit()
       }
       catch (error) {
@@ -36,8 +41,8 @@ return async env => {
 
       await nodemailer_feedback.sendMail(
         {
-          from: globals.feedback_from,
-          to: globals.feedback_to,
+          from: feedback_from,
+          to: feedback_to,
           subject: 'Page: ' + page,
           text: message
         }