From 8a72faa99c6fee451e95844c07e210c0129f9013 Mon Sep 17 00:00:00 2001 From: vgilc Date: Wed, 27 Aug 2014 14:58:24 +0000 Subject: [PATCH] 2014-08-27 Vanessa Gil * godmode/reporting/reporting_builder.php: Owner of a report can be delete it. Ticket #1199. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ .../godmode/reporting/reporting_builder.php | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 92c9507368..880968ebdd 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2014-08-27 Vanessa Gil + + * godmode/reporting/reporting_builder.php: Owner of a report can be delete it. + Ticket #1199. + 2014-08-27 Vanessa Gil * godmode/groups/group_list.php: Fixed problem displaying empty diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index cbb193b007..25189dc334 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -494,10 +494,14 @@ switch ($action) { && users_can_manage_group_all($report["id_group"], "RW"); - $delete = check_acl($config['id_user'], - $report['id_group'], "RM") - && - users_can_manage_group_all($report["id_group"], "RM"); + if ($config['id_user'] == $report['id_user']) { + $delete = true; //owner can delete + } else { + $delete = check_acl($config['id_user'], + $report['id_group'], "RM") + && + users_can_manage_group_all($report["id_group"], "RM"); + } break; case 'group_edit': $edit = check_acl($config['id_user'],