Merge pull request '1791_dreprecate_boot-salixjs' (#266) from 1791_dreprecate_boot-salixjs into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
commit
10049fa8a2
|
@ -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;
|
||||
|
|
|
@ -23,7 +23,7 @@ describe('factory vnModuleLoader', () => {
|
|||
}
|
||||
];
|
||||
|
||||
$httpBackend.whenGET('modelInfo')
|
||||
$httpBackend.whenGET('Schemas/modelInfo')
|
||||
.respond({
|
||||
FooModel: {
|
||||
properties: {
|
||||
|
|
|
@ -3,11 +3,10 @@
|
|||
"base": "PersistedModel",
|
||||
"acls": [
|
||||
{
|
||||
"property": "validations",
|
||||
"accessType": "EXECUTE",
|
||||
"property": "modelInfo",
|
||||
"principalType": "ROLE",
|
||||
"principalId": "$everyone",
|
||||
"permission": "ALLOW"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
|
@ -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));
|
||||
});
|
||||
});
|
||||
};
|
|
@ -21,7 +21,7 @@
|
|||
"required": true
|
||||
},
|
||||
"priority": {
|
||||
"type": "nomber",
|
||||
"type": "Number",
|
||||
"required": true
|
||||
}
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue