diff --git a/front/core/lib/module-loader.js b/front/core/lib/module-loader.js index 18f0a3ea3..c48e7d93d 100644 --- a/front/core/lib/module-loader.js +++ b/front/core/lib/module-loader.js @@ -11,7 +11,7 @@ export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $t this.loaded = {}; this.imports = {}; this.moduleImport = moduleImport; - this.modelInfo = $http.get(`modelInfo`) + this.modelInfo = $http.get(`Schemas/modelInfo`) .then(json => { this.onModelInfoReady(json); this.modelInfo = true; diff --git a/front/core/lib/specs/module-loader.spec.js b/front/core/lib/specs/module-loader.spec.js index 2f756f7be..dbed5e9a0 100644 --- a/front/core/lib/specs/module-loader.spec.js +++ b/front/core/lib/specs/module-loader.spec.js @@ -23,7 +23,7 @@ describe('factory vnModuleLoader', () => { } ]; - $httpBackend.whenGET('modelInfo') + $httpBackend.whenGET('Schemas/modelInfo') .respond({ FooModel: { properties: { diff --git a/loopback/common/models/schema.json b/loopback/common/models/schema.json index face506ff..1bdf0fcf7 100644 --- a/loopback/common/models/schema.json +++ b/loopback/common/models/schema.json @@ -3,11 +3,10 @@ "base": "PersistedModel", "acls": [ { - "property": "validations", - "accessType": "EXECUTE", + "property": "modelInfo", "principalType": "ROLE", "principalId": "$everyone", "permission": "ALLOW" } ] -} +} \ No newline at end of file diff --git a/loopback/server/boot/salix.js b/loopback/server/boot/salix.js deleted file mode 100644 index 018389e40..000000000 --- a/loopback/server/boot/salix.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = function(app) { - // FIXME: Fix until the original can be used - app.get('/api/modelInfo', function(req, res) { - app.models.Schema.modelInfo({req}).then(json => { - res.set('Content-Type', 'application/json'); - res.send(JSON.stringify(json)); - }); - }); -}; diff --git a/modules/claim/back/models/claim-state.json b/modules/claim/back/models/claim-state.json index c905aacba..287a525ad 100644 --- a/modules/claim/back/models/claim-state.json +++ b/modules/claim/back/models/claim-state.json @@ -21,7 +21,7 @@ "required": true }, "priority": { - "type": "nomber", + "type": "Number", "required": true } },