extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Don't keep sort order when setting owner, use what is set

Browse Source
This commit is contained in:
nathangray 2020-06-05 13:22:13 -06:00
parent c92fb09d8d
commit aed7914a67
2 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
calendar/js/app.js
View File

@ -2127,24 +2127,6 @@ var CalendarApp = /** @class */ (function (_super) {
});
// Make sure they're all strings
state.state.owner = state.state.owner.map(function (owner) { return '' + owner; });
// Keep sort order
if (typeof this.state.owner === 'object') {
var owner = [];
this.state.owner.forEach(function (key) {
var found = false;
state.state.owner = state.state.owner.filter(function (item) {
if (!found && item == key) {
owner.push(item);
found = true;
return false;
}
else
return true;
});
});
// Add in any new owners
state.state.owner = owner.concat(state.state.owner);
}
if (state.state.owner.indexOf('0') >= 0) {
state.state.owner[state.state.owner.indexOf('0')] = this.egw.user('account_id');
}
@ -2218,8 +2200,8 @@ var CalendarApp = /** @class */ (function (_super) {
break;
default:
var end = state.state.last = view.end_date(state.state).toJSON();
for (var owner_1 = 0; owner_1 < grid_count && owner_1 < state.state.owner.length; owner_1++) {
var _owner = grid_count > 1 ? state.state.owner[owner_1] || 0 : state.state.owner;
for (var owner = 0; owner < grid_count && owner < state.state.owner.length; owner++) {
var _owner = grid_count > 1 ? state.state.owner[owner] || 0 : state.state.owner;
value.push({
id: CalendarApp._daywise_cache_id(date, _owner),
start_date: date,

19
calendar/js/app.ts
View File

@ -2420,24 +2420,7 @@ class CalendarApp extends EgwApp
});
// Make sure they're all strings
state.state.owner = state.state.owner.map(function(owner) { return ''+owner;});
// Keep sort order
if(typeof this.state.owner === 'object')
{
var owner = [];
this.state.owner.forEach(function(key) {
var found = false;
state.state.owner = state.state.owner.filter(function(item) {
if(!found && item == key) {
owner.push(item);
found = true;
return false;
} else
return true;
});
});
// Add in any new owners
state.state.owner = owner.concat(state.state.owner);
}
if (state.state.owner.indexOf('0') >= 0)
{
state.state.owner[state.state.owner.indexOf('0')] = this.egw.user('account_id');