From af4607222d0b67af2901ec7ed88a89340e319c11 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 4 Mar 2013 23:31:30 +0000 Subject: [PATCH] Return correct true or false based on if the value was added or deleted successfully, was always true --- .../class.etemplate_widget_nextmatch.inc.php | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php index 7228160ea3..6161a2ea4d 100644 --- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php +++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php @@ -796,7 +796,7 @@ class etemplate_widget_nextmatch extends etemplate_widget public static function ajax_set_favorite($app, $name, $action, $group, $filters = array()) { $pref_name = "favorite_".$name; - if($group && $GLOBALS['egw']['apps']['admin']) + if($group && $GLOBALS['egw_info']['apps']['admin']) { $prefs = new preferences(is_numeric($group) ? $group: $GLOBALS['egw_info']['user']['account_id']); } @@ -808,15 +808,24 @@ class etemplate_widget_nextmatch extends etemplate_widget $type = $group == "all" ? "default" : "user"; if($action == "add") { - $prefs->add($app,$pref_name,$filters,$type); + $filters = array( + 'group' => $group, + 'filter' => $filters + ); + $result = $prefs->add($app,$pref_name,$filters,$type); + $prefs->save_repository(false,$type); + + egw_json_response::get()->data(isset($result[$app][$pref_name])); + return isset($result[$app][$pref_name]); } else if ($action == "delete") { - $prefs->delete($app,$pref_name, $type); - } - $prefs->save_repository(false,$type); + $result = $prefs->delete($app,$pref_name, $type); + $prefs->save_repository(false,$type); - egw_json_response::get()->data(true); + egw_json_response::get()->data(!isset($result[$app][$pref_name])); + return !isset($result[$app][$pref_name]); + } } /**