From 429d3f518ea06b0a5d3de6b31f10e49f03fac2ca Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Mon, 2 Apr 2018 21:34:28 -0400
Subject: [PATCH] moved instanceName to index.ejs

---
 src/public/javascripts/services/tree.js | 1 -
 src/routes/api/tree.js                  | 5 ++---
 src/routes/index.js                     | 2 ++
 src/services/sql.js                     | 8 ++++----
 src/views/index.ejs                     | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/public/javascripts/services/tree.js b/src/public/javascripts/services/tree.js
index e65ae87b3..545b600bb 100644
--- a/src/public/javascripts/services/tree.js
+++ b/src/public/javascripts/services/tree.js
@@ -370,7 +370,6 @@ function getNotePathFromAddress() {
 async function loadTree() {
     const resp = await server.get('tree');
     startNotePath = resp.start_note_path;
-    window.glob.instanceName = resp.instanceName;
 
     if (document.location.hash) {
         startNotePath = getNotePathFromAddress();
diff --git a/src/routes/api/tree.js b/src/routes/api/tree.js
index b5eb01e9d..dfd90b691 100644
--- a/src/routes/api/tree.js
+++ b/src/routes/api/tree.js
@@ -51,10 +51,9 @@ async function getTree() {
     });
 
     return {
-        instanceName: config.General ? config.General.instanceName : null,
+        start_note_path: await optionService.getOption('start_note_path'),
         branches: branches,
-        notes: notes,
-        start_note_path: await optionService.getOption('start_note_path')
+        notes: notes
     };
 }
 
diff --git a/src/routes/index.js b/src/routes/index.js
index 373819a19..d5157135d 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -3,11 +3,13 @@
 const sourceIdService = require('../services/source_id');
 const sql = require('../services/sql');
 const labelService = require('../services/labels');
+const config = require('../services/config');
 
 async function index(req, res) {
     res.render('index', {
         sourceId: await sourceIdService.generateSourceId(),
         maxSyncIdAtLoad: await sql.getValue("SELECT MAX(id) FROM sync"),
+        instanceName: config.General ? config.General.instanceName : null,
         appCss: await getAppCss()
     });
 }
diff --git a/src/services/sql.js b/src/services/sql.js
index 12bd2efd5..1e0c18370 100644
--- a/src/services/sql.js
+++ b/src/services/sql.js
@@ -31,15 +31,15 @@ async function replace(table_name, rec) {
 }
 
 async function beginTransaction() {
-    return await wrap(async db => db.run("BEGIN"));
+    return await execute("BEGIN");
 }
 
 async function commit() {
-    return await wrap(async db => db.run("COMMIT"));
+    return await execute("COMMIT");
 }
 
 async function rollback() {
-    return await wrap(async db => db.run("ROLLBACK"));
+    return await execute("ROLLBACK");
 }
 
 async function getRow(query, params = []) {
@@ -47,7 +47,7 @@ async function getRow(query, params = []) {
 }
 
 async function getRowOrNull(query, params = []) {
-    const all = await wrap(async db => db.all(query, ...params));
+    const all = await getRows(query, params);
 
     return all.length > 0 ? all[0] : null;
 }
diff --git a/src/views/index.ejs b/src/views/index.ejs
index c59afbf21..bcfd24fa6 100644
--- a/src/views/index.ejs
+++ b/src/views/index.ejs
@@ -488,7 +488,8 @@
       window.glob = {
           activeDialog: null,
           sourceId: '<%= sourceId %>',
-          maxSyncIdAtLoad: <%= maxSyncIdAtLoad %>
+          maxSyncIdAtLoad: <%= maxSyncIdAtLoad %>,
+          instanceName: '<%= instanceName %>'
       };
     </script>