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

Allow to import the same topic multiple times

Browse Source 
Remove checking for duplicated topic names.
Allows to import topics more than once, usefull if you have to import an
agenda over and over again.
This commit is contained in:
Sean 2020-06-18 15:51:51 +02:00
parent b43151fd59
commit 55f65576f0
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/core/ui-services/base-import.service.ts
View File

@ -26,7 +26,7 @@ export interface NewEntry<V> {
newEntry: V; newEntry: V;
status: CsvImportStatus; status: CsvImportStatus;
errors: string[]; errors: string[];
hasDuplicates: boolean; hasDuplicates?: boolean;
importTrackId?: number; importTrackId?: number;
} }

11
client/src/app/site/topics/services/topic-import.service.ts
View File

@ -30,7 +30,6 @@ export class TopicImportService extends BaseImportService<CreateTopic> {
*/ */
public errorList = { public errorList = {
NoTitle: 'A Topic needs a title', NoTitle: 'A Topic needs a title',
Duplicates: 'A topic with this title already exists',
ParsingErrors: 'Some csv values could not be read correctly.' ParsingErrors: 'Some csv values could not be read correctly.'
}; };
@ -99,7 +98,6 @@ export class TopicImportService extends BaseImportService<CreateTopic> {
newEntry[this.expectedHeader[idx]] = line[idx]; newEntry[this.expectedHeader[idx]] = line[idx];
} }
} }
const hasDuplicates = this.repo.getViewModelList().some(topic => topic.title === newEntry.title);
// set type to 'public' if none is given in import // set type to 'public' if none is given in import
if (!newEntry.agenda_type) { if (!newEntry.agenda_type) {
@ -107,13 +105,9 @@ export class TopicImportService extends BaseImportService<CreateTopic> {
} }
const mappedEntry: NewEntry<CreateTopic> = { const mappedEntry: NewEntry<CreateTopic> = {
newEntry: newEntry, newEntry: newEntry,
hasDuplicates: hasDuplicates,
status: 'new', status: 'new',
errors: [] errors: []
}; };
if (hasDuplicates) {
this.setError(mappedEntry, 'Duplicates');
}
if (hasErrors) { if (hasErrors) {
this.setError(mappedEntry, 'ParsingErrors'); this.setError(mappedEntry, 'ParsingErrors');
} }
@ -196,16 +190,11 @@ export class TopicImportService extends BaseImportService<CreateTopic> {
agenda_type: 1 // set type to 'public item' by default agenda_type: 1 // set type to 'public item' by default
}) })
); );
const hasDuplicates = this.repo.getViewModelList().some(topic => topic.title === newTopic.title);
const newEntry: NewEntry<CreateTopic> = { const newEntry: NewEntry<CreateTopic> = {
newEntry: newTopic, newEntry: newTopic,
hasDuplicates: hasDuplicates,
status: 'new', status: 'new',
errors: [] errors: []
}; };
if (hasDuplicates) {
this.setError(newEntry, 'Duplicates');
}
newEntries.push(newEntry); newEntries.push(newEntry);
}); });
this.setParsedEntries(newEntries); this.setParsedEntries(newEntries);