Skip to content

Commit 1817f42

Browse files
author
Jean-François Morin
committed
Improved collection parameter handling
1 parent 8444ea9 commit 1817f42

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import { Process } from '../../../../process-page/processes/process.model';
3030
import { hasValue } from '../../../../shared/empty.util';
3131
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
3232
import { FiltersComponent } from '../../filters-section/filters-section.component';
33+
import { OptionVO } from '../option-vo.model';
3334
import { QueryPredicate } from '../query-predicate.model';
3435

3536
@Component({
@@ -88,7 +89,7 @@ export class FilteredItemsExportCsvComponent implements OnInit {
8889
const colls = this.reportParams.value.collections || [];
8990
for (let i = 0; i < colls.length; i++) {
9091
if (colls[i]) {
91-
parameters.push({ name: '-c', value: colls[i] });
92+
parameters.push({ name: '-c', value: OptionVO.toString(colls[i]) });
9293
}
9394
}
9495

src/app/admin/admin-reports/filtered-items/option-vo.model.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ export class OptionVO {
4646
subscriber.next(value);
4747
subscriber.complete();
4848
});
49+
}
4950

51+
static toString(obj: any): string {
52+
if (obj) {
53+
if (obj instanceof OptionVO && obj.id) {
54+
return obj.id;
55+
}
56+
return obj as string;
57+
}
58+
return "";
5059
}
60+
5161
}

0 commit comments

Comments
 (0)