diff --git a/front/src/components/manage/moderation/ReportCard.vue b/front/src/components/manage/moderation/ReportCard.vue
index 17bc71f37..7053b2bbb 100644
--- a/front/src/components/manage/moderation/ReportCard.vue
+++ b/front/src/components/manage/moderation/ReportCard.vue
@@ -120,6 +120,10 @@
The object associated with this report was deleted.
+
+
+ View public page
+
Open in moderation interface
@@ -223,7 +227,7 @@
@@ -352,15 +356,17 @@ export default {
actions.push({
label: this.$pgettext('Content/Moderation/Button/Verb', 'Delete reported object'),
modalHeader: this.$pgettext('Content/Moderation/Popup/Header', 'Delete reported object?'),
- modalContent: this.$pgettext('Content/Moderation/Popup,Paragraph', 'This will delete the object associated with this report. This action is irreversible.'),
+ modalContent: this.$pgettext('Content/Moderation/Popup,Paragraph', 'This will delete the object associated with this report and mark the report as resolved. The deletion is irreversible.'),
modalConfirmLabel: this.$pgettext('*/*/*/Verb', 'Delete'),
icon: 'x',
iconColor: 'red',
+ show: (obj) => { return !!obj.target },
dangerous: true,
handler: () => {
axios.delete(deleteUrl).then((response) => {
console.log('Target deleted')
self.obj.target = null
+ self.resolve(true)
}, error => {
console.log('Error while deleting target')
})
diff --git a/front/src/entities.js b/front/src/entities.js
index 18c05b248..c86becda9 100644
--- a/front/src/entities.js
+++ b/front/src/entities.js
@@ -15,7 +15,8 @@ export default {
return `manage/library/artists/${obj.id}/`
},
urls: {
- getAdminDetail: (obj) => { return {name: 'manage.library.artists.detail', params: {id: obj.id}}}
+ getDetail: (obj) => { return {name: 'library.artists.detail', params: {id: obj.id}}},
+ getAdminDetail: (obj) => { return {name: 'manage.library.artists.detail', params: {id: obj.id}}},
},
moderatedFields: [
{
@@ -49,6 +50,7 @@ export default {
return `manage/library/albums/${obj.id}/`
},
urls: {
+ getDetail: (obj) => { return {name: 'library.albums.detail', params: {id: obj.id}}},
getAdminDetail: (obj) => { return {name: 'manage.library.albums.detail', params: {id: obj.id}}}
},
moderatedFields: [
@@ -89,6 +91,7 @@ export default {
return `manage/library/tracks/${obj.id}/`
},
urls: {
+ getDetail: (obj) => { return {name: 'library.tracks.detail', params: {id: obj.id}}},
getAdminDetail: (obj) => { return {name: 'manage.library.tracks.detail', params: {id: obj.id}}}
},
moderatedFields: [
@@ -156,6 +159,7 @@ export default {
label: this.$pgettext('*/*/*', 'Playlist'),
icon: 'list',
urls: {
+ getDetail: (obj) => { return {name: 'library.playlists.detail', params: {id: obj.id}}},
// getAdminDetail: (obj) => { return {name: 'manage.playlists.detail', params: {id: obj.id}}}
},
moderatedFields: [
diff --git a/front/src/views/admin/moderation/ReportsList.vue b/front/src/views/admin/moderation/ReportsList.vue
index 87bf97d2f..73acaf112 100644
--- a/front/src/views/admin/moderation/ReportsList.vue
+++ b/front/src/views/admin/moderation/ReportsList.vue
@@ -55,7 +55,7 @@
-
+