From 9de29584a4971b118f0286254401be8761f68fb6 Mon Sep 17 00:00:00 2001 From: azivner Date: Wed, 2 Jan 2019 20:08:41 +0100 Subject: [PATCH] added data directory to options -> about --- src/public/javascripts/dialogs/options.js | 12 +++++++----- src/services/app_info.js | 4 +++- src/views/dialogs/options.ejs | 5 +++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/public/javascripts/dialogs/options.js b/src/public/javascripts/dialogs/options.js index 90c76b6d2..8394d5344 100644 --- a/src/public/javascripts/dialogs/options.js +++ b/src/public/javascripts/dialogs/options.js @@ -198,15 +198,17 @@ addTabHandler((async function () { const $syncVersion = $("#sync-version"); const $buildDate = $("#build-date"); const $buildRevision = $("#build-revision"); + const $dataDirectory = $("#data-directory"); const appInfo = await server.get('app-info'); - $appVersion.html(appInfo.appVersion); - $dbVersion.html(appInfo.dbVersion); - $syncVersion.html(appInfo.syncVersion); - $buildDate.html(appInfo.buildDate); - $buildRevision.html(appInfo.buildRevision); + $appVersion.text(appInfo.appVersion); + $dbVersion.text(appInfo.dbVersion); + $syncVersion.text(appInfo.syncVersion); + $buildDate.text(appInfo.buildDate); + $buildRevision.text(appInfo.buildRevision); $buildRevision.attr('href', 'https://github.com/zadam/trilium/commit/' + appInfo.buildRevision); + $dataDirectory.text(appInfo.dataDirectory); return {}; })()); diff --git a/src/services/app_info.js b/src/services/app_info.js index 5576b99ef..5b7f4cffa 100644 --- a/src/services/app_info.js +++ b/src/services/app_info.js @@ -2,6 +2,7 @@ const build = require('./build'); const packageJson = require('../../package'); +const {TRILIUM_DATA_DIR} = require('./data_dir'); const APP_DB_VERSION = 121; const SYNC_VERSION = 2; @@ -11,5 +12,6 @@ module.exports = { dbVersion: APP_DB_VERSION, syncVersion: SYNC_VERSION, buildDate: build.buildDate, - buildRevision: build.buildRevision + buildRevision: build.buildRevision, + dataDirectory: TRILIUM_DATA_DIR }; \ No newline at end of file diff --git a/src/views/dialogs/options.ejs b/src/views/dialogs/options.ejs index dc98ddd55..11d086c99 100644 --- a/src/views/dialogs/options.ejs +++ b/src/views/dialogs/options.ejs @@ -216,6 +216,11 @@ Build revision: + + + Data directory: + +