extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

* All apps: some favorites could not be deleted (reappeared after reload/next login)

Browse Source
This commit is contained in:
Ralf Becker 2015-08-27 11:31:31 +00:00
parent 7a57615e38
commit 4615c6c3db
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.egw_favorites.inc.php
View File

@ -189,7 +189,7 @@ class egw_favorites
{ {
// Only use alphanumeric for preference name, so it can be used directly as DOM ID // Only use alphanumeric for preference name, so it can be used directly as DOM ID
$name = strip_tags($_name); $name = strip_tags($_name);
$pref_name = "favorite_".preg_replace('/[^A-Za-z0-9-_]/','_',$name); $pref_name = "favorite_".$name;
// older group-favorites have just true as their group and are not deletable, if we dont find correct group // older group-favorites have just true as their group and are not deletable, if we dont find correct group
if ($group === true || $group === '1') if ($group === true || $group === '1')

10
phpgwapi/js/jsapi/app_base.js
View File

@ -380,7 +380,7 @@ var AppJS = Class.extend(
li.addClass('ui-state-highlight'); li.addClass('ui-state-highlight');
},50); },50);
} }
var state = {}; var state = {};
var pref = egw.preference('favorite_' + this.dataset.id, self.appname); var pref = egw.preference('favorite_' + this.dataset.id, self.appname);
if(pref) if(pref)
@ -614,7 +614,7 @@ var AppJS = Class.extend(
self.egw.jsonq(self.appname+'.egw_framework.ajax_set_favorite.template', self.egw.jsonq(self.appname+'.egw_framework.ajax_set_favorite.template',
[ [
self.appname, self.appname,
name.val(), safe_name,
"add", "add",
self.favorite_popup.group.get_value(), self.favorite_popup.group.get_value(),
self.favorite_popup.state self.favorite_popup.state
@ -775,7 +775,7 @@ var AppJS = Class.extend(
favorite = egw.preference('favorite_'+this.dataset.id,self.appname); favorite = egw.preference('favorite_'+this.dataset.id,self.appname);
} }
if(!favorite || jQuery.isEmptyObject(favorite)) return; if(!favorite || jQuery.isEmptyObject(favorite)) return;
var match_count = 0; var match_count = 0;
for(var state_key in state) for(var state_key in state)
{ {
@ -783,7 +783,7 @@ var AppJS = Class.extend(
{ {
match_count++; match_count++;
} }
else if (typeof state[state_key] != 'undefined' && state[state_key] && typeof state[state_key] === 'object' else if (typeof state[state_key] != 'undefined' && state[state_key] && typeof state[state_key] === 'object'
&& typeof favorite.state != 'undefined' && typeof favorite.state[state_key] != 'undefined' && favorite.state[state_key] && typeof favorite.state[state_key] === 'object') && typeof favorite.state != 'undefined' && typeof favorite.state[state_key] != 'undefined' && favorite.state[state_key] && typeof favorite.state[state_key] === 'object')
{ {
if((typeof state[state_key].length !== 'undefined' || typeof state[state_key].length !== 'undefined') if((typeof state[state_key].length !== 'undefined' || typeof state[state_key].length !== 'undefined')
@ -827,7 +827,7 @@ var AppJS = Class.extend(
{ {
// Skip, might be set, might not // Skip, might be set, might not
} }
else if (typeof state[state_key] !== 'undefined' else if (typeof state[state_key] !== 'undefined'
&& typeof favorite.state != 'undefined'&&typeof favorite.state[state_key] !== 'undefined' && typeof favorite.state != 'undefined'&&typeof favorite.state[state_key] !== 'undefined'
&& state[state_key] != favorite.state[state_key]) && state[state_key] != favorite.state[state_key])
{ {