extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-27 05:11:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'No filters' favorite handling to detect and use internal name 'blank' instead of translated label.

Browse Source 
Copied from parent.
This commit is contained in:
Nathan Gray 2014-02-24 23:50:51 +00:00
parent 96795b9de5
commit d221a84c29
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/app.js
View File

@ -1078,7 +1078,7 @@ app.classes.calendar = AppJS.extend(
// old calendar state handling on server-side (incl. switching to and from listview) // old calendar state handling on server-side (incl. switching to and from listview)
var menuaction = 'calendar.calendar_uiviews.index'; var menuaction = 'calendar.calendar_uiviews.index';
if (typeof state.state != 'undefined' && (state.state.view == 'undefined' || state.state.view == 'listview')) if (typeof state.state != 'undefined' && (typeof state.state.view == 'undefined' || state.state.view == 'listview'))
{ {
// check if we already use et2 / are in listview // check if we already use et2 / are in listview
if (this.et2 || etemplate2 && etemplate2.getByApplication('calendar')) if (this.et2 || etemplate2 && etemplate2.getByApplication('calendar'))
@ -1110,11 +1110,12 @@ app.classes.calendar = AppJS.extend(
} }
} }
menuaction = 'calendar.calendar_uilist.listview'; menuaction = 'calendar.calendar_uilist.listview';
state.state.ajax = 'true';
if (state.name) if (state.name)
{ {
state.state.favorite = state.name.replace(/[^A-Za-z0-9-_]/g, '_'); // 'blank' is the special name for no filters, send that instead of the nice translated name
state.state.favorite = jQuery.isEmptyObject(state) || jQuery.isEmptyObject(state.state||state.filter) ? 'blank' : state.name.replace(/[^A-Za-z0-9-_]/g, '_');
} }
state.state.ajax = 'true';
} }
// setting internal state now, that linkHandler does not intercept switching from listview to any old view // setting internal state now, that linkHandler does not intercept switching from listview to any old view
this.state = state; this.state = state;