mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-26 01:43:47 +01:00
More calendar bugfixes:
- reload loop in home - sidebox keywords did nothing - list view participants filter was missing groups - Sidebox user filter updates list view to match
This commit is contained in:
parent
7fb9d4d15f
commit
211056ba2e
@ -857,11 +857,13 @@ class calendar_ui
|
||||
egw_framework::refresh_opener($error, 'calendar');
|
||||
}
|
||||
unset($_GET['merge']);
|
||||
|
||||
// This doesn't give message either, but at least it doesn't give a blank screen
|
||||
egw_framework::redirect_link('/index.php', array(
|
||||
'msg' => $error,
|
||||
'cd' => 'yes'
|
||||
));
|
||||
if($error)
|
||||
{
|
||||
// This doesn't give message either, but at least it doesn't give a blank screen
|
||||
egw_framework::redirect_link('/index.php', array(
|
||||
'msg' => $error,
|
||||
'cd' => 'yes'
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -370,7 +370,7 @@ class calendar_uilist extends calendar_ui
|
||||
{
|
||||
$search_params['users'] = is_array($params['col_filter']['participant']) ? $params['col_filter']['participant'] : (int) $params['col_filter']['participant'];
|
||||
}
|
||||
elseif(empty($params['search'])) // active search displays entries from all users
|
||||
elseif (!$params['col_filter'] || !array_key_exists('participant',$params['col_filter']))
|
||||
{
|
||||
$search_params['users'] = explode(',',$this->owner);
|
||||
}
|
||||
|
@ -313,7 +313,19 @@ app.classes.calendar = AppJS.extend(
|
||||
|
||||
if (this.sidebox_et2 && typeof app.classes.calendar.views[view] == 'undefined')
|
||||
{
|
||||
this.sidebox_et2.getWidgetById('iframe').set_src(_url);
|
||||
for(var key in q)
|
||||
{
|
||||
q[key] = unescape(q[key]);
|
||||
}
|
||||
if(q.owner)
|
||||
{
|
||||
q.owner = q.owner.split(',');
|
||||
q.owner = q.owner.reduce(function(p,c) {if(p.indexOf(c)<0) p.push(c);return p;},[]);
|
||||
q.owner = q.owner.join(',');
|
||||
}
|
||||
q.menuaction = 'calendar.calendar_uiviews.index';
|
||||
this.sidebox_et2.getWidgetById('iframe').set_src(egw.link('/index.php',q));
|
||||
$j(this.sidebox_et2.parentNode).show();
|
||||
return true;
|
||||
}
|
||||
// Known AJAX view
|
||||
@ -1645,6 +1657,7 @@ app.classes.calendar = AppJS.extend(
|
||||
state.state.enddate = state.state.end_date;
|
||||
}
|
||||
state.state.col_filter = {participant: state.state.owner};
|
||||
state.state.search = state.state.keywords;
|
||||
|
||||
// Pass status filter in as status filter, avoids conflicts with nm filter
|
||||
state.state.status_filter = state.state.filter;
|
||||
|
@ -46,7 +46,7 @@
|
||||
</vbox>
|
||||
<nextmatch-sortheader label="Owner" id="cal_owner" readonly="true"/>
|
||||
<nextmatch-sortheader label="Location" id="cal_location"/>
|
||||
<nextmatch-accountfilter label="Participants" id="participant" options="All"/>
|
||||
<nextmatch-accountfilter label="Participants" id="participant" empty_label="All" account_type="both"/>
|
||||
<vbox>
|
||||
<nextmatch-sortheader label="Created" id="cal_created" sortmode="DESC"/>
|
||||
<nextmatch-header label="Creator" id="cal_creator" options="Creator"/>
|
||||
|
Loading…
Reference in New Issue
Block a user