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

Merge pull request #4323 from MaximilianKrambach/fixUpdates

Browse Source 
fix wrong array handling
This commit is contained in:
Emanuel Schütze 2019-02-12 21:26:17 +01:00 committed by GitHub
commit 397ec0d579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/src/app/site/motions/models/view-motion.ts
View File

@ -483,11 +483,19 @@ export class ViewMotion extends BaseAgendaViewModel implements Searchable {
public updateUser(update: ViewUser): void { public updateUser(update: ViewUser): void {
if (this.motion.submitters && this.motion.submitters.findIndex(user => user.user_id === update.id)) { if (this.motion.submitters && this.motion.submitters.findIndex(user => user.user_id === update.id)) {
const userIndex = this.submitters.findIndex(user => user.id === update.id); const userIndex = this.submitters.findIndex(user => user.id === update.id);
this.submitters[userIndex] = update; if (userIndex < 0) {
this.submitters.push(update);
} else {
this.submitters[userIndex] = update;
}
} }
if (this.motion.supporters_id && this.motion.supporters_id.includes(update.id)) { if (this.motion.supporters_id && this.motion.supporters_id.includes(update.id)) {
const userIndex = this.supporters.findIndex(user => user.id === update.id); const userIndex = this.supporters.findIndex(user => user.id === update.id);
this.supporters[userIndex] = update; if (userIndex < 0) {
this.supporters.push(update);
} else {
this.supporters[userIndex] = update;
}
} }
} }
@ -499,14 +507,22 @@ export class ViewMotion extends BaseAgendaViewModel implements Searchable {
public updateAttachments(mediafile: ViewMediafile): void { public updateAttachments(mediafile: ViewMediafile): void {
if (this.attachments_id && this.attachments_id.includes(mediafile.id)) { if (this.attachments_id && this.attachments_id.includes(mediafile.id)) {
const attachmentIndex = this.attachments.findIndex(_mediafile => _mediafile.id === mediafile.id); const attachmentIndex = this.attachments.findIndex(_mediafile => _mediafile.id === mediafile.id);
this.attachments[attachmentIndex] = mediafile; if (attachmentIndex < 0) {
this.attachments.push(mediafile);
} else {
this.attachments[attachmentIndex] = mediafile;
}
} }
} }
public updateTags(tag: ViewTag): void { public updateTags(tag: ViewTag): void {
if (this.tags_id && this.tags_id.includes(tag.id)) { if (this.tags_id && this.tags_id.includes(tag.id)) {
const tagIndex = this.tags.findIndex(_tag => _tag.id === tag.id); const tagIndex = this.tags.findIndex(_tag => _tag.id === tag.id);
this.tags[tagIndex] = tag; if (tagIndex < 0) {
this.tags.push(tag);
} else {
this.tags[tagIndex] = tag;
}
} }
} }