Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 03:16:11 +01:00
Code Issues Packages Projects Releases Activity

added app and db versions to about dialog in settings

Browse Source
This commit is contained in:
azivner
2017-11-16 20:03:44 -05:00
parent fed1cab2c9
commit 7e3fd2f63e
5 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
routes/api/settings.js
View File

@@ -8,14 +8,23 @@ const audit_category = require('../../services/audit_category');
const auth = require('../../services/auth');
const utils = require('../../services/utils');
const build = require('../../services/build');
const packageJson = require('../../package');
const migration = require('../../services/migration');
// options allowed to be updated directly in settings dialog
const ALLOWED_OPTIONS = ['protected_session_timeout', 'history_snapshot_time_interval'];
function addExtraSettings(settings) {
Object.assign(settings, build);
settings['app_version'] = packageJson.version;
settings['db_version'] = migration.APP_DB_VERSION;
}
router.get('/all', auth.checkApiAuth, async (req, res, next) => {
const settings = await sql.getMap("SELECT opt_name, opt_value FROM options");
Object.assign(settings, build);
addExtraSettings(settings);
res.send(settings);
});
@@ -24,7 +33,7 @@ router.get('/', auth.checkApiAuth, async (req, res, next) => {
const settings = await sql.getMap("SELECT opt_name, opt_value FROM options WHERE opt_name IN ("
+ ALLOWED_OPTIONS.map(x => '?').join(",") + ")", ALLOWED_OPTIONS);
Object.assign(settings, build);
addExtraSettings(settings);
res.send(settings);
});