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

More calendar bugfixes:

Browse Source 
- 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:
Nathan Gray 2015-10-14 18:10:39 +00:00
parent 7fb9d4d15f
commit 211056ba2e
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -857,11 +857,13 @@ class calendar_ui
egw_framework::refresh_opener($error, 'calendar'); egw_framework::refresh_opener($error, 'calendar');
} }
unset($_GET['merge']); unset($_GET['merge']);
if($error)
{
// This doesn't give message either, but at least it doesn't give a blank screen // This doesn't give message either, but at least it doesn't give a blank screen
egw_framework::redirect_link('/index.php', array( egw_framework::redirect_link('/index.php', array(
'msg' => $error, 'msg' => $error,
'cd' => 'yes' 'cd' => 'yes'
)); ));
} }
}
} }

2
calendar/inc/class.calendar_uilist.inc.php
View File

@ -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']; $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); $search_params['users'] = explode(',',$this->owner);
} }

15
calendar/js/app.js
View File

@ -313,7 +313,19 @@ app.classes.calendar = AppJS.extend(
if (this.sidebox_et2 && typeof app.classes.calendar.views[view] == 'undefined') 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; return true;
} }
// Known AJAX view // Known AJAX view
@ -1645,6 +1657,7 @@ app.classes.calendar = AppJS.extend(
state.state.enddate = state.state.end_date; state.state.enddate = state.state.end_date;
} }
state.state.col_filter = {participant: state.state.owner}; 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 // Pass status filter in as status filter, avoids conflicts with nm filter
state.state.status_filter = state.state.filter; state.state.status_filter = state.state.filter;

2
calendar/templates/default/list.xet
View File

@ -46,7 +46,7 @@
</vbox> </vbox>
<nextmatch-sortheader label="Owner" id="cal_owner" readonly="true"/> <nextmatch-sortheader label="Owner" id="cal_owner" readonly="true"/>
<nextmatch-sortheader label="Location" id="cal_location"/> <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> <vbox>
<nextmatch-sortheader label="Created" id="cal_created" sortmode="DESC"/> <nextmatch-sortheader label="Created" id="cal_created" sortmode="DESC"/>
<nextmatch-header label="Creator" id="cal_creator" options="Creator"/> <nextmatch-header label="Creator" id="cal_creator" options="Creator"/>