From de332b7cdad7e5db7b460880c4cf400cfbb2867a Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 7 Mar 2013 09:46:35 +0000 Subject: [PATCH] 2013-03-07 Sergio Martin * include/functions_events.php operation/events/events.build_table.php: Fixed the owner info in wrong column of event view for bug 3607097 Fixed a problem changing the owner when change status too git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7804 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/include/functions_events.php | 12 +++++++++--- .../operation/events/events.build_table.php | 18 ++++++++++++------ 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1c750e555e..119eece2ff 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2013-03-07 Sergio Martin + + * include/functions_events.php + operation/events/events.build_table.php: Fixed the owner info + in wrong column of event view for bug 3607097 + + Fixed a problem changing the owner when change status too + 2013-03-07 Sergio Martin * operation/events/events.build_table.php: Added carriage diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 12cb18fbf6..4c931cd62f 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -498,7 +498,7 @@ function events_change_owner ($id_event, $new_owner = false, $force = false, $me } // If no new_owner is provided, the current user will be the owner - if($new_owner === false) { + if(empty($new_owner)) { $new_owner = $config['id_user']; } @@ -511,9 +511,9 @@ function events_change_owner ($id_event, $new_owner = false, $force = false, $me $where = array('id_evento' => $id_event); - // If not force, add to where if owner_user <> '' + // If not force, add to where if owner_user = '' if(!$force) { - $where['owner_user'] = '<>'; + $where['owner_user'] = ''; } $ret = db_process_sql_update($event_table, $values, @@ -2059,6 +2059,9 @@ function events_page_general ($event) { } else { $user_owner = db_get_value('fullname', 'tusuario', 'id_user', $event["owner_user"]); + if(empty($user_owner)) { + $user_owner = $event['owner_user']; + } $data[1] = $user_owner; } $table_general->data[] = $data; @@ -2122,6 +2125,9 @@ function events_page_general ($event) { if($event['estado'] == 1) { $user_ack = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']); + if(empty($user_ack)) { + $user_ack = $event['id_usuario']; + } $date_ack = date ($config["date_format"], $event['ack_utimestamp']); $data[1] = $user_ack.' ('.$date_ack.')'; } diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php index 51a0964875..bc5c628941 100644 --- a/pandora_console/operation/events/events.build_table.php +++ b/pandora_console/operation/events/events.build_table.php @@ -319,15 +319,21 @@ foreach ($result as $event) { $i++; } - if (in_array('owner_user',$show_fields)) { - $owner_name = db_get_value('fullname', 'tusuario', 'id_user', $event['owner_user']); - $data[$i] = $owner_name; + if (in_array('id_usuario',$show_fields)) { + $user_name = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']); + if(empty($user_name)) { + $user_name = $event['id_usuario']; + } + $data[$i] = $user_name; $i++; } - if (in_array('id_usuario',$show_fields)) { - $user_name = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']); - $data[$i] = $user_name; + if (in_array('owner_user',$show_fields)) { + $owner_name = db_get_value('fullname', 'tusuario', 'id_user', $event['owner_user']); + if(empty($owner_name)) { + $owner_name = $event['owner_user']; + } + $data[$i] = $owner_name; $i++; }