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

Merge pull request #4997 from GabrielInTheWorld/funWithState

Browse Source 
Changes the order of states in filter
This commit is contained in:
Emanuel Schütze 2019-09-10 17:31:13 +02:00 committed by GitHub
commit b949761404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/app/site/motions/services/motion-filter-list.service.ts
View File

@ -283,22 +283,21 @@ export class MotionFilterListService extends BaseFilterListService<ViewMotion> {
// convert to filter options // convert to filter options
if (workflowFilters && workflowFilters.length) { if (workflowFilters && workflowFilters.length) {
let workflowOptions: OsFilterOptions = []; let workflowOptions: OsFilterOptions = [];
for (const filterDef of workflowFilters) {
workflowOptions.push(filterDef.name);
workflowOptions = workflowOptions.concat(filterDef.filter);
}
// add "done" and "undone" // add "done" and "undone"
workflowOptions.push('-');
workflowOptions.push({ workflowOptions.push({
label: 'Done', label: 'Done',
condition: finalStates condition: finalStates
}); });
workflowOptions.push({ workflowOptions.push({
label: this.translate.instant('Undone'), label: this.translate.instant('Undone'),
condition: nonFinalStates condition: nonFinalStates
}); });
workflowOptions.push('-');
for (const filterDef of workflowFilters) {
workflowOptions.push(filterDef.name);
workflowOptions = workflowOptions.concat(filterDef.filter);
}
this.stateFilterOptions.options = workflowOptions; this.stateFilterOptions.options = workflowOptions;
} }