@reldens/cms 0.75.0 → 0.77.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -304,6 +304,10 @@ window.addEventListener('DOMContentLoaded', () => {
|
|
|
304
304
|
}
|
|
305
305
|
let idValueInput = editForm.querySelector('.entity-id-value');
|
|
306
306
|
if(idValueInput){
|
|
307
|
+
let idDisplayInput = editForm.querySelector('[name="disabled-'+idValueInput.name+'"]');
|
|
308
|
+
if(idDisplayInput){
|
|
309
|
+
idDisplayInput.value = '';
|
|
310
|
+
}
|
|
307
311
|
idValueInput.value = '';
|
|
308
312
|
}
|
|
309
313
|
let titleElement = document.querySelector('.entity-edit h2');
|
|
@@ -300,6 +300,18 @@ class RouterContents
|
|
|
300
300
|
let idProperty = this.fetchEntityIdPropertyKey(driverResource);
|
|
301
301
|
let idsFilter = {[idProperty]: {operator: 'IN', value: ids}};
|
|
302
302
|
let loadedEntities = await entityRepository.load(idsFilter);
|
|
303
|
+
let deleteControl = {prevented: false, result: ''};
|
|
304
|
+
await this.emitEvent('reldens.adminBeforeEntityDelete', {
|
|
305
|
+
driverResource,
|
|
306
|
+
entityPath,
|
|
307
|
+
idProperty,
|
|
308
|
+
ids,
|
|
309
|
+
loadedEntities,
|
|
310
|
+
deleteControl
|
|
311
|
+
});
|
|
312
|
+
if(deleteControl.prevented){
|
|
313
|
+
return redirectPath + (deleteControl.result || 'errorDeletePrevented');
|
|
314
|
+
}
|
|
303
315
|
await this.deleteEntitiesRelatedFiles(driverResource, loadedEntities);
|
|
304
316
|
let deleteResult = await entityRepository.delete(idsFilter);
|
|
305
317
|
await this.emitEvent('reldens.adminAfterEntityDelete', {driverResource, idProperty, ids});
|
|
@@ -345,8 +357,10 @@ class RouterContents
|
|
|
345
357
|
let saveResult = await this.saveEntity(id, entityRepository, entityDataPatch);
|
|
346
358
|
if(!saveResult){
|
|
347
359
|
Logger.error('Save result error.', saveResult, entityDataPatch);
|
|
348
|
-
return this.
|
|
349
|
-
|
|
360
|
+
return this.appendResultParam(
|
|
361
|
+
this.generateEntityRoute('editPath', driverResource, idProperty, null, id),
|
|
362
|
+
'saveEntityStorageError'
|
|
363
|
+
);
|
|
350
364
|
}
|
|
351
365
|
await this.emitEvent('reldens.adminAfterEntitySave', {
|
|
352
366
|
req,
|
|
@@ -370,7 +384,10 @@ class RouterContents
|
|
|
370
384
|
}
|
|
371
385
|
let saveAction = sc.get(req.body, 'saveAction', 'save');
|
|
372
386
|
if('saveAndContinue' === saveAction){
|
|
373
|
-
return this.
|
|
387
|
+
return this.appendResultParam(
|
|
388
|
+
this.generateEntityRoute('editPath', driverResource, idProperty, saveResult),
|
|
389
|
+
'success'
|
|
390
|
+
);
|
|
374
391
|
}
|
|
375
392
|
if('saveAndGoBack' === saveAction){
|
|
376
393
|
return this.rootPath+'/'+entityPath+'?result=success';
|
|
@@ -824,6 +841,14 @@ class RouterContents
|
|
|
824
841
|
return this.rootPath + '/' + driverResource.entityPath + this[routeType] + idParam;
|
|
825
842
|
}
|
|
826
843
|
|
|
844
|
+
appendResultParam(route, result)
|
|
845
|
+
{
|
|
846
|
+
if(route.includes('?')){
|
|
847
|
+
return route+'&result='+result;
|
|
848
|
+
}
|
|
849
|
+
return route+'?result='+result;
|
|
850
|
+
}
|
|
851
|
+
|
|
827
852
|
}
|
|
828
853
|
|
|
829
854
|
module.exports.RouterContents = RouterContents;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reldens/cms",
|
|
3
3
|
"scope": "@reldens",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.77.0",
|
|
5
5
|
"description": "Reldens - CMS",
|
|
6
6
|
"author": "Damian A. Pastorini",
|
|
7
7
|
"license": "MIT",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@reldens/server-utils": "^0.53.0",
|
|
38
|
-
"@reldens/storage": "^0.
|
|
38
|
+
"@reldens/storage": "^0.105.0",
|
|
39
39
|
"@reldens/utils": "^0.57.0",
|
|
40
40
|
"dotenv": "17.4.2",
|
|
41
41
|
"mustache": "4.2.0"
|