Merge pull request '1791_dreprecate_boot-salixjs' (#266) from 1791_dreprecate_boot-salixjs into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2020-05-21 08:50:47 +00:00
commit 10049fa8a2
5 changed files with 5 additions and 15 deletions

View File

@ -11,7 +11,7 @@ export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $t
this.loaded = {}; this.loaded = {};
this.imports = {}; this.imports = {};
this.moduleImport = moduleImport; this.moduleImport = moduleImport;
this.modelInfo = $http.get(`modelInfo`) this.modelInfo = $http.get(`Schemas/modelInfo`)
.then(json => { .then(json => {
this.onModelInfoReady(json); this.onModelInfoReady(json);
this.modelInfo = true; this.modelInfo = true;

View File

@ -23,7 +23,7 @@ describe('factory vnModuleLoader', () => {
} }
]; ];
$httpBackend.whenGET('modelInfo') $httpBackend.whenGET('Schemas/modelInfo')
.respond({ .respond({
FooModel: { FooModel: {
properties: { properties: {

View File

@ -3,11 +3,10 @@
"base": "PersistedModel", "base": "PersistedModel",
"acls": [ "acls": [
{ {
"property": "validations", "property": "modelInfo",
"accessType": "EXECUTE",
"principalType": "ROLE", "principalType": "ROLE",
"principalId": "$everyone", "principalId": "$everyone",
"permission": "ALLOW" "permission": "ALLOW"
} }
] ]
} }

View File

@ -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));
});
});
};

View File

@ -21,7 +21,7 @@
"required": true "required": true
}, },
"priority": { "priority": {
"type": "nomber", "type": "Number",
"required": true "required": true
} }
}, },