ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4416 from MaximilianKrambach/categoryHotFix

Browse Source 
category sort view hotfix
This commit is contained in:
Emanuel Schütze 2019-02-27 14:30:36 +01:00 committed by GitHub
commit 1ce6804a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/app/site/motions/components/category-list/category-list.component.ts
View File

@ -188,10 +188,21 @@ export class CategoryListComponent extends BaseViewComponent implements OnInit {
* @returns all motions in the category
*/
public motionsInCategory(category: Category): ViewMotion[] {
const coll = new Intl.Collator(this.translate.currentLang);
return this.motionRepo
.getViewModelList()
.filter(m => m.category_id === category.id)
.sort((motion1, motion2) => motion1.identifier.localeCompare(motion2.identifier));
.sort((motion1, motion2) => {
if (motion1.identifier && motion2.identifier) {
return coll.compare(motion1.identifier, motion2.identifier);
} else if (motion1.identifier) {
return 1;
} else if (motion2.identifier) {
return -1;
} else {
return coll.compare(motion1.getTitle(), motion2.getTitle());
}
});
}
/**