extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 03:19:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed opening of addressbook entries sometimes fails after searching: caused by not detected filter change and kept, but no longer displayed selection

Browse Source 
JSON.stringify(this.controller._filters) == JSON.stringify(this.activeFilters) seems always true, like if it is a reference and not the old state
changed code not to change activeFilters only by calling applyFilters with requested change and detecting there if we have a change
This commit is contained in:
Ralf Becker 2014-03-04 13:49:33 +00:00
parent 97a5a41867
commit 5af397132a
1 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
etemplate/js/et2_extension_nextmatch.js
View File

@ -180,7 +180,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
{ {
window.clearInterval(this._autorefresh_timer); window.clearInterval(this._autorefresh_timer);
} }
// Free the grid components // Free the grid components
this.dataview.free(); this.dataview.free();
this.rowProvider.free(); this.rowProvider.free();
@ -314,12 +314,6 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
} }
} }
// Update the entry in the activeFilters object
this.activeFilters["sort"] = {
"id": _id,
"asc": _asc
};
// Set the sortmode display // Set the sortmode display
this.iterateOver(function(_widget) { this.iterateOver(function(_widget) {
_widget.setSortmode((_widget.id == _id) ? (_asc ? "asc": "desc") : "none"); _widget.setSortmode((_widget.id == _id) ? (_asc ? "asc": "desc") : "none");
@ -327,7 +321,15 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
if (_update) if (_update)
{ {
this.applyFilters(); this.applyFilters({sort: { id: _id, asc: _asc}});
}
else
{
// Update the entry in the activeFilters object
this.activeFilters["sort"] = {
"id": _id,
"asc": _asc
};
} }
}, },
@ -345,8 +347,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
}, this, et2_INextmatchSortable); }, this, et2_INextmatchSortable);
// Delete the "sort" filter entry // Delete the "sort" filter entry
delete(this.activeFilters["sort"]); this.applyFilters({sort: undefined});
this.applyFilters();
} }
}, },
@ -365,6 +366,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
this.activeFilters.col_filter = {}; this.activeFilters.col_filter = {};
} }
var changed = false;
if (typeof _set == 'object') if (typeof _set == 'object')
{ {
for(var s in _set) for(var s in _set)
@ -373,12 +375,24 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
{ {
for(var c in _set.col_filter) for(var c in _set.col_filter)
{ {
this.activeFilters.col_filter[c] = _set.col_filter[c]; if (this.activeFilters.col_filter[c] !== _set.col_filter[c])
{
if (_set.col_filter[c])
{
this.activeFilters.col_filter[c] = _set.col_filter[c];
}
else
{
delete this.activeFilters.col_filter[c];
}
changed = true;
}
} }
} }
else else if (this.activeFilters[s] !== _set[s])
{ {
this.activeFilters[s] = _set[s]; this.activeFilters[s] = _set[s];
changed = true;
} }
} }
} }
@ -386,7 +400,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
this.egw().debug("info", "Changing nextmatch filters to ", this.activeFilters); this.egw().debug("info", "Changing nextmatch filters to ", this.activeFilters);
// Keep the selection after applying filters, but only if unchanged // Keep the selection after applying filters, but only if unchanged
if(JSON.stringify(this.controller._filters) == JSON.stringify(this.activeFilters)) if(!changed)
{ {
this.controller.keepSelection(); this.controller.keepSelection();
} }
@ -438,7 +452,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
{ {
return; return;
} }
if (typeof _type == 'undefined') _type = 'edit'; if (typeof _type == 'undefined') _type = 'edit';
if (typeof _row_ids == 'string' || typeof _row_ids == 'number') _row_ids = [_row_ids]; if (typeof _row_ids == 'string' || typeof _row_ids == 'number') _row_ids = [_row_ids];
if (typeof _row_ids == "undefined" || _row_ids === null) if (typeof _row_ids == "undefined" || _row_ids === null)
@ -467,13 +481,13 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
// No next, select previous // No next, select previous
next = (entry.ao?entry.ao.getPrevious(1):null); next = (entry.ao?entry.ao.getPrevious(1):null);
} }
// Stop automatic updating // Stop automatic updating
this.dataview.grid.doInvalidate = false; this.dataview.grid.doInvalidate = false;
for(var i = 0; i < _row_ids.length; i++) for(var i = 0; i < _row_ids.length; i++)
{ {
uid = (this.controller.dataStorePrefix || app) + "::" + _row_ids[i]; uid = (this.controller.dataStorePrefix || app) + "::" + _row_ids[i];
// Delete from internal references // Delete from internal references
this.controller.deleteRow(uid); this.controller.deleteRow(uid);
} }
@ -1792,8 +1806,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
this.search_button = et2_createWidget("button", {id: "search_button","label":">"}, this); this.search_button = et2_createWidget("button", {id: "search_button","label":">"}, this);
this.search_button.onclick = function(event) { this.search_button.onclick = function(event) {
self.nextmatch.activeFilters.search = self.search.getValue(); self.nextmatch.applyFilters({search: self.search.getValue()});
self.nextmatch.applyFilters();
}; };
@ -1829,9 +1842,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
// this is the lettersearch table // this is the lettersearch table
jQuery("td",this).removeClass("lettersearch_active"); jQuery("td",this).removeClass("lettersearch_active");
jQuery(event.target).addClass("lettersearch_active"); jQuery(event.target).addClass("lettersearch_active");
var letter = event.target.id; event.data.applyFilters({searchletter: event.target.id || false});
event.data.activeFilters.searchletter = (letter == "" ? false : letter);
event.data.applyFilters();
}); });
// Set activeFilters to current value // Set activeFilters to current value
this.nextmatch.activeFilters.searchletter = current_letter; this.nextmatch.activeFilters.searchletter = current_letter;
@ -1939,8 +1950,9 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
{ {
// Make sure to get the new value for filtering // Make sure to get the new value for filtering
input.change(this.nextmatch, function(event) { input.change(this.nextmatch, function(event) {
event.data.activeFilters[name] = select.getValue(); var set = {};
event.data.applyFilters(); set[name] = select.getValue();
event.data.applyFilters(set);
}); });
// Get the onchange function string // Get the onchange function string
@ -1959,8 +1971,9 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
else // default request changed rows with new filters, previous this.form.submit() else // default request changed rows with new filters, previous this.form.submit()
{ {
input.change(this.nextmatch, function(event) { input.change(this.nextmatch, function(event) {
event.data.activeFilters[name] = select.getValue(); var set = {};
event.data.applyFilters(); set[name] = select.getValue();
event.data.applyFilters(set);
}); });
} }
return select; return select;
@ -2428,7 +2441,7 @@ var et2_nextmatch_sortheader = et2_nextmatch_header.extend(et2_INextmatchSortabl
{ {
// Set via nextmatch after setup // Set via nextmatch after setup
if(this.nextmatch) return; if(this.nextmatch) return;
this.setSortmode(_mode); this.setSortmode(_mode);
}, },
@ -2470,20 +2483,12 @@ var et2_nextmatch_filterheader = et2_selectbox.extend([et2_INextmatchHeader, et2
// Not fully set up yet // Not fully set up yet
return; return;
} }
if(typeof event.data.nextmatch.activeFilters.col_filter == 'undefined') var col_filter = {};
event.data.nextmatch.activeFilters.col_filter = {}; col_filter[event.data.id] = event.data.input.val();
if(event.data.input.val())
{
event.data.nextmatch.activeFilters["col_filter"][event.data.id] = event.data.input.val();
}
else
{
delete (event.data.nextmatch.activeFilters["col_filter"][event.data.id]);
}
// Set value so it's there for response (otherwise it gets cleared if options are updated) // Set value so it's there for response (otherwise it gets cleared if options are updated)
event.data.set_value(event.data.input.val()); event.data.set_value(event.data.input.val());
event.data.nextmatch.applyFilters(); event.data.nextmatch.applyFilters({col_filter: col_filter});
}); });
}, },
@ -2537,18 +2542,9 @@ var et2_nextmatch_accountfilterheader = et2_selectAccount.extend([et2_INextmatch
// Not fully set up yet // Not fully set up yet
return; return;
} }
if(typeof event.data.nextmatch.activeFilters.col_filter == 'undefined') var col_filter = {};
event.data.nextmatch.activeFilters.col_filter = {}; col_filter[event.data.id] = event.data.getValue();
if(event.data.getValue()) event.data.nextmatch.applyFilters({col_filter: col_filter});
{
event.data.nextmatch.activeFilters["col_filter"][event.data.id] = event.data.getValue();
}
else
{
delete (event.data.nextmatch.activeFilters["col_filter"][event.data.id]);
}
event.data.nextmatch.applyFilters();
}); });
}, },
@ -2598,25 +2594,22 @@ var et2_nextmatch_entryheader = et2_link_entry.extend(et2_INextmatchHeader,
*/ */
select: function(event, selected) { select: function(event, selected) {
this._super.apply(this, arguments); this._super.apply(this, arguments);
if(typeof this.nextmatch.activeFilters.col_filter == 'undefined') var col_filter = {};
this.nextmatch.activeFilters.col_filter = {};
if(selected && selected.item.value) { if(selected && selected.item.value) {
if(event.data.options.only_app) if(event.data.options.only_app)
{ {
// Only one application, just give the ID // Only one application, just give the ID
this.nextmatch.activeFilters["col_filter"][this.id] = selected.item.value; col_filter[this.id] = selected.item.value;
} }
else else
{ {
// App is expecting app:id // App is expecting app:id
this.nextmatch.activeFilters["col_filter"][this.id] = col_filter[this.id] = event.data.app_select.val() + ":"+ selected.item.value;
event.data.app_select.val() + ":"+ selected.item.value;
} }
} else { } else {
delete (this.nextmatch.activeFilters["col_filter"][this.id]); col_filter[this.id] = '';
} }
this.nextmatch.applyFilters.call(this.nextmatch); this.nextmatch.applyFilters.call(this.nextmatch, {col_filter: col_filter});
}, },
/** /**