mirror of
https://github.com/zadam/trilium.git
synced 2024-12-25 00:34:08 +08:00
added build date & revision
This commit is contained in:
parent
f9056c6754
commit
fbce84e779
5 changed files with 39 additions and 1 deletions
|
@ -21,7 +21,7 @@ const settings = (function() {
|
||||||
|
|
||||||
dialogEl.dialog({
|
dialogEl.dialog({
|
||||||
modal: true,
|
modal: true,
|
||||||
width: 600
|
width: 800
|
||||||
});
|
});
|
||||||
|
|
||||||
tabsEl.tabs();
|
tabsEl.tabs();
|
||||||
|
@ -148,6 +148,21 @@ settings.addModule((function () {
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
settingsLoaded
|
||||||
|
};
|
||||||
|
})());
|
||||||
|
|
||||||
|
settings.addModule((function () {
|
||||||
|
const buildDateEl = $("#build-date");
|
||||||
|
const buildRevisionEl = $("#build-revision");
|
||||||
|
|
||||||
|
function settingsLoaded(settings) {
|
||||||
|
buildDateEl.html(settings['buildDate']);
|
||||||
|
buildRevisionEl.html(settings['buildRevision']);
|
||||||
|
buildRevisionEl.attr('href', 'https://github.com/zadam/trilium/commit/' + settings['buildRevision']);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
settingsLoaded
|
settingsLoaded
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,6 +7,7 @@ const options = require('../../services/options');
|
||||||
const audit_category = require('../../services/audit_category');
|
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');
|
||||||
|
|
||||||
// options allowed to be updated directly in settings dialog
|
// options allowed to be updated directly in settings dialog
|
||||||
const ALLOWED_OPTIONS = ['encryption_session_timeout', 'history_snapshot_time_interval'];
|
const ALLOWED_OPTIONS = ['encryption_session_timeout', 'history_snapshot_time_interval'];
|
||||||
|
@ -14,6 +15,8 @@ const ALLOWED_OPTIONS = ['encryption_session_timeout', 'history_snapshot_time_in
|
||||||
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);
|
||||||
|
|
||||||
res.send(settings);
|
res.send(settings);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -21,6 +24,8 @@ 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);
|
||||||
|
|
||||||
res.send(settings);
|
res.send(settings);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
1
services/build.js
Normal file
1
services/build.js
Normal file
|
@ -0,0 +1 @@
|
||||||
|
module.exports = { buildDate:"2017-11-13T23:17:28-05:00", buildRevision: "f9056c6754293da6dc2803eb7f04e0902f08be6f" };
|
3
set-build.sh
Executable file
3
set-build.sh
Executable file
|
@ -0,0 +1,3 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
echo 'module.exports = { buildDate:"'`date --iso-8601=seconds`'", buildRevision: "'`git log -1 --format="%H"`'" };' > services/build.js
|
|
@ -153,6 +153,7 @@
|
||||||
<li><a href="#change-password">Change password</a></li>
|
<li><a href="#change-password">Change password</a></li>
|
||||||
<li><a href="#encryption-timeout">Encryption timeout</a></li>
|
<li><a href="#encryption-timeout">Encryption timeout</a></li>
|
||||||
<li><a href="#history-snapshot-time-interval">History snapshots</a></li>
|
<li><a href="#history-snapshot-time-interval">History snapshots</a></li>
|
||||||
|
<li><a href="#about">About Trilium</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div id="change-password">
|
<div id="change-password">
|
||||||
<form id="change-password-form">
|
<form id="change-password-form">
|
||||||
|
@ -199,6 +200,19 @@
|
||||||
<button class="btn btn-sm">Save</button>
|
<button class="btn btn-sm">Save</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="about">
|
||||||
|
<table class="table">
|
||||||
|
<tr>
|
||||||
|
<th>Build date:</th>
|
||||||
|
<td id="build-date"></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th>Build revision:</th>
|
||||||
|
<td><a href="" target="_blank" id="build-revision"></a></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue