Skip to content

Commit

Permalink
Merge branch 'stable' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mrzapp committed Feb 9, 2021
2 parents 2e27904 + f6c233c commit a0c8dbc
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 7 deletions.
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@
"scripts": {
"build:frontend": "webpack --progress",
"watch:frontend": "webpack --watch --progress",

"start": "npm run build:frontend && node hashbrown.js",
"update": "git pull && git submodule update --recursive --init && npm install && npm run build:frontend",

"watch:nodemon": "nodemon hashbrown.js",

"db:docker": "cd ./docker && sudo docker-compose exec mongodb mongo",
"restart:docker": "cd ./docker && sudo docker-compose restart",
"start:docker": "npm run build:frontend && cd ./docker && sudo docker-compose up --build -d",
Expand Down
2 changes: 2 additions & 0 deletions src/Common/Entity/Context.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

/**
* A class for holding information about the current context
*
* @memberof HashBrown.Common.Entity
*/
class Context extends HashBrown.Entity.EntityBase {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Entity/Resource/ResourceBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Basic resource class
*
* @memberof HashBrown.Common.Entity
* @memberof HashBrown.Common.Entity.Resource
*/
class ResourceBase extends HashBrown.Entity.EntityBase {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Entity/Resource/SchemaBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* The base class for all Schema types
*
* @memberof HashBrown.Common.Entity.Resource
* @memberof HashBrown.Common.Entity.Resource.Schema
*/
class SchemaBase extends HashBrown.Entity.Resource.ResourceBase {
set icon(name) { this.customIcon = name; }
Expand Down
2 changes: 2 additions & 0 deletions src/Common/Entity/View/ViewBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

/**
* The base view class
*
* @memberof HashBrown.Common.Entity.View
*/
class ViewBase extends HashBrown.Entity.EntityBase {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/Server/Controller/ControllerBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class ControllerBase extends require('Common/Controller/ControllerBase') {
static error(error, context) {
checkParam(error, 'error', Error, true);

debug.error(error, this, true);
debug.error(error, this);

return new HashBrown.Http.Response(error.message || 'Unexpected error', error.code || 500, error.headers || {});
}
Expand Down
2 changes: 2 additions & 0 deletions src/Server/Controller/ViewController.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ class ViewController extends HashBrown.Controller.ControllerBase {
error.code = 500;
}

debug.error(error, this);

switch(error.code) {
default:
return this.render('error', { message: error.message, context: context }, error.code);
Expand Down
2 changes: 1 addition & 1 deletion src/Server/Service/ConfigService.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class ConfigService {
all[configName] = await this.get(configName);
}

if(!all.system) { all.system = {}; }
if(!all.system) { all.system = { rootUrl: '' }; }
if(!all.database) { all.database = {}; }

return all;
Expand Down

0 comments on commit a0c8dbc

Please sign in to comment.