Skip to content

Commit bcc075a

Browse files
committed
Prevent conflicting plugin views
1 parent 256c74a commit bcc075a

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
## [Known Issues]
77
- None. Please feel free to submit an issue via [GitHub](https://github.com/ryanblenis/MeshCentral-DevTools) if you find anything.
88

9+
## [0.0.2] - 2020-03-07
10+
### Fixed
11+
- Prevent race condition with conflicting plugins changing the app views directory by using absolute paths
12+
913
## [0.0.1] - 2019-11-24
1014
### Added
1115
- Released initial version

config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Dev Tools",
33
"shortName": "devtools",
4-
"version": "0.0.1",
4+
"version": "0.0.2",
55
"author": "Ryan Blenis",
66
"description": "Tools for plugin developers to make testing easier.",
77
"hasAdminPanel": true,

devtools.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ module.exports.devtools = function (parent) {
1111
var obj = {};
1212
obj.parent = parent;
1313
obj.meshServer = parent.parent;
14+
obj.VIEWS = __dirname + '/views/';
1415

1516
obj.handleAdminReq = function(req, res, user) {
1617
if ((user.siteadmin & 0xFFFFFFFF) == 0) { res.sendStatus(401); return; }
1718
var vars = {};
18-
res.render('admin', vars);
19+
res.render(obj.VIEWS + 'admin', vars);
1920
};
2021

2122
obj.serveraction = function(command, myparent, grandparent) {

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MeshCentral-DevTools
22

3-
*Released: 2019-11-24*
3+
*Released: 2020-03-07*
44

55
Tools to aid plugin developers for the [MeshCentral2](https://github.com/Ylianst/MeshCentral) Project.
66

0 commit comments

Comments
 (0)