extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

If a home favorite loses it's associated favorite (it gets deleted), open the config dialog so user can pick another instead of always being blank.

Browse Source
This commit is contained in:
Nathan Gray 2015-05-04 15:26:18 +00:00
parent 9e3676a8c9
commit f1983a3f07
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,13 +64,15 @@ class calendar_favorite_portlet extends home_favorite_portlet
else else
{ {
$ui = new calendar_uiviews(); $ui = new calendar_uiviews();
if ($this->favorite)
{
if($this->favorite['state']['start']) $ui->search_params['start'] = $this->favorite['state']['start']; if($this->favorite['state']['start']) $ui->search_params['start'] = $this->favorite['state']['start'];
if($this->favorite['state']['cat_id']) $ui->search_params['cat_id'] = $this->favorite['state']['cat_id']; if($this->favorite['state']['cat_id']) $ui->search_params['cat_id'] = $this->favorite['state']['cat_id'];
// Owner can be 0 for current user // Owner can be 0 for current user
if(array_key_exists('owner',$this->favorite['state'])) $ui->search_params['users'] = explode(',',$this->favorite['state']['owner']); if(array_key_exists('owner',$this->favorite['state'])) $ui->search_params['users'] = explode(',',$this->favorite['state']['owner']);
if($this->favorite['state']['filter']) $ui->search_params['filter'] = $this->favorite['state']['filter']; if($this->favorite['state']['filter']) $ui->search_params['filter'] = $this->favorite['state']['filter'];
if($this->favorite['state']['sortby']) $ui->search_params['sortby'] = $this->favorite['state']['sortby']; if($this->favorite['state']['sortby']) $ui->search_params['sortby'] = $this->favorite['state']['sortby'];
}
$etemplate->read('home.legacy'); $etemplate->read('home.legacy');
$etemplate->set_dom_id($id); $etemplate->set_dom_id($id);

3
home/inc/class.home_favorite_portlet.inc.php
View File

@ -186,9 +186,12 @@ class home_favorite_portlet extends home_portlet
$favorites = egw_favorites::get_favorites($this->context['appname']); $favorites = egw_favorites::get_favorites($this->context['appname']);
$favorite_list = array(); $favorite_list = array();
foreach($favorites as $id => $favorite) foreach($favorites as $id => $favorite)
{
if($favorite)
{ {
$favorite_list[$id] = $favorite['name']; $favorite_list[$id] = $favorite['name'];
} }
}
$favorite = array( $favorite = array(
'label' => lang('Favorite'), 'label' => lang('Favorite'),
'name' => 'favorite', 'name' => 'favorite',

10
home/js/app.js
View File

@ -873,6 +873,16 @@ app.classes.home.home_weather_portlet = app.classes.home.home_portlet.extend({
} }
}); });
app.classes.home.home_favorite_portlet = app.classes.home.home_portlet.extend({ app.classes.home.home_favorite_portlet = app.classes.home.home_portlet.extend({
init: function(portlet) {
// call parent
this._super.apply(this, arguments);
// Somehow favorite got lost, or is not set
if(!portlet.options.settings.favorite)
{
portlet.edit_settings();
}
},
observer: function(_msg, _app, _id, _type, _msg_type, _targetapp) observer: function(_msg, _app, _id, _type, _msg_type, _targetapp)
{ {
if(this.portlet.class.indexOf(_app) == 0 || this.portlet.class == 'home_favorite_portlet') if(this.portlet.class.indexOf(_app) == 0 || this.portlet.class == 'home_favorite_portlet')