holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove 'No filters' option, as it causes errors

Browse Source
This commit is contained in:
Nathan Gray 2015-05-04 20:11:52 +00:00
parent e15f9803d2
commit 1d88af167c
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/inc/class.calendar_favorite_portlet.inc.php
View File

@ -197,4 +197,23 @@ class calendar_favorite_portlet extends home_favorite_portlet
}
}
}
/**
* No filters default favorite causes problems with calendar's special state handling,
* so just remove it.
* @return type
*/
public function get_properties()
{
$properties = parent::get_properties();
foreach($properties as &$property)
{
if($property['name'] == 'favorite')
{
unset($property['select_options']['blank']);
break;
}
}
return $properties;
}
}

4
home/js/app.js
View File

@ -878,7 +878,9 @@ app.classes.home.home_favorite_portlet = app.classes.home.home_portlet.extend({
this._super.apply(this, arguments);
// Somehow favorite got lost, or is not set
if(!portlet.options.settings.favorite)
if(portlet.options && portlet.options.settings && typeof portlet.options.settings !== 'undefined' &&
!portlet.options.settings.favorite
)
{
portlet.edit_settings();
}