gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/javascripts/dialogs/settings.js
View File

@ -152,13 +152,17 @@ settings.addModule((function () {
})()); })());
settings.addModule((function () { settings.addModule((function () {
const appVersionEl = $("#app-version");
const dbVersionEl = $("#db-version");
const buildDateEl = $("#build-date"); const buildDateEl = $("#build-date");
const buildRevisionEl = $("#build-revision"); const buildRevisionEl = $("#build-revision");
function settingsLoaded(settings) { function settingsLoaded(settings) {
buildDateEl.html(settings['buildDate']); appVersionEl.html(settings.app_version);
buildRevisionEl.html(settings['buildRevision']); dbVersionEl.html(settings.db_version);
buildRevisionEl.attr('href', 'https://github.com/zadam/trilium/commit/' + settings['buildRevision']); buildDateEl.html(settings.build_date);
buildRevisionEl.html(settings.build_revision);
buildRevisionEl.attr('href', 'https://github.com/zadam/trilium/commit/' + settings.build_revision);
} }
return { return {

13
routes/api/settings.js
View File

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

2
services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2017-11-16T19:29:52-05:00", buildRevision: "c371ffb5974d8dccaec76c78dfa91dd54fcc624e" }; module.exports = { build_date:"2017-11-16T19:29:52-05:00", build_revision: "c371ffb5974d8dccaec76c78dfa91dd54fcc624e" };

2
set-build.sh
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
echo 'module.exports = { buildDate:"'`date --iso-8601=seconds`'", buildRevision: "'`git log -1 --format="%H"`'" };' > services/build.js echo 'module.exports = { build_date:"'`date --iso-8601=seconds`'", build_revision: "'`git log -1 --format="%H"`'" };' > services/build.js

10
views/index.ejs
View File

@ -202,6 +202,16 @@
</div> </div>
<div id="about"> <div id="about">
<table class="table"> <table class="table">
<tr>
<th>App version:</th>
<td id="app-version"></td>
</tr>
<tr>
<th>DB version:</th>
<td id="db-version"></td>
</tr>
<tr> <tr>
<th>Build date:</th> <th>Build date:</th>
<td id="build-date"></td> <td id="build-date"></td>