extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-18 12:30:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix attribute inheritance didn't work properly

Browse Source 
- Get nextmatch filterheader working
This commit is contained in:
nathangray
2020-02-04 16:07:50 -07:00
parent 12eb1dec61
commit e0bc769315
7 changed files with 88 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/et2_core_inheritance.ts
View File

@@ -166,11 +166,11 @@ export class ClassWithAttributes
class_prototype = Object.getPrototypeOf(class_prototype);
} while (class_prototype !== ClassWithAttributes && n < 50);
for(let i = class_tree.length - 1; i > 0; i--)
for(let i = class_tree.length - 1; i >= 0; i--)
{
class_tree[i-1]._attributes = ClassWithAttributes.extendAttributes(class_tree[i-1]._attributes,class_tree[i]._attributes);
attributes = ClassWithAttributes.extendAttributes(attributes,class_tree[i]._attributes);
}
return class_tree[0]._attributes;
return attributes;
}
/**
* Extend current _attributes with the one from the parent class