antville/antville
antville/antville
1
1
Fork 0
Code Issues 48 Pull requests 9 Projects Releases 9 Wiki Activity Actions

fix: exception when trying to delete image file

Browse source
This commit is contained in:
Tobi Schäfer 2018-05-20 18:50:59 +02:00
parent 0ba3b4800c
commit a21c378b7a
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
code/User/User.js
View file

@ -67,6 +67,7 @@ User.remove = function() {
if (this.constructor !== User) return; if (this.constructor !== User) return;
const deleteMetadata = (type, table, id) => { const deleteMetadata = (type, table, id) => {
app.log('Removing metadata: ' + type + ' #' + id);
sql.execute("delete from metadata where parent_type = '$0' and parent_id in (select id from $1 where creator_id = $2)", type, table, id); sql.execute("delete from metadata where parent_type = '$0' and parent_id in (select id from $1 where creator_id = $2)", type, table, id);
}; };
@ -116,20 +117,11 @@ User.remove = function() {
sql.execute('delete from file where creator_id = $0', id); sql.execute('delete from file where creator_id = $0', id);
sql.execute('update file set modifier_id = creator_id where modifier_id = $0', id); sql.execute('update file set modifier_id = creator_id where modifier_id = $0', id);
sql.retrieve('select id from skin where creator_id = $0', id);
sql.traverse(function() {
// Instead of deleting, assign skins to another site owner
const skin = Skin.getById(this.id);
const creator = getAnotherOwner(skin.layout.site);
app.log('Assigning new creator: skin #' + this.id);
sql.execute('update skin set creator_id = $0 where creator_id = $1', creator._id, id);
});
sql.execute('update skin set modifier_id = creator_id where modifier_id = $0', id);
sql.retrieve('select id from image where creator_id = $0', id); sql.retrieve('select id from image where creator_id = $0', id);
sql.traverse(function() { sql.traverse(function() {
const image = Image.getById(this.id); const image = Image.getById(this.id);
if (image.parent_type === 'Layout' && image.parent) { if (image.parent_type === 'Layout') {
if (!image.parent) return;
// Instead of deleting, assign layout images to another site owner // Instead of deleting, assign layout images to another site owner
const creator = getAnotherOwner(image.parent.site); const creator = getAnotherOwner(image.parent.site);
app.log('Assigning new creator: layout image #' + this.id); app.log('Assigning new creator: layout image #' + this.id);
@ -142,6 +134,16 @@ User.remove = function() {
sql.execute('delete from image where creator_id = $0', id); sql.execute('delete from image where creator_id = $0', id);
sql.execute('update image set modifier_id = creator_id where modifier_id = $0', id); sql.execute('update image set modifier_id = creator_id where modifier_id = $0', id);
sql.retrieve('select id from skin where creator_id = $0', id);
sql.traverse(function() {
// Instead of deleting, assign skins to another site owner
const skin = Skin.getById(this.id);
const creator = getAnotherOwner(skin.layout.site);
app.log('Assigning new creator: skin #' + this.id);
sql.execute('update skin set creator_id = $0 where creator_id = $1', creator._id, id);
});
sql.execute('update skin set modifier_id = creator_id where modifier_id = $0', id);
sql.retrieve('select id from layout where creator_id = $0', id); sql.retrieve('select id from layout where creator_id = $0', id);
sql.traverse(function() { sql.traverse(function() {
// Instead of deleting, assign layouts to another site owner // Instead of deleting, assign layouts to another site owner