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

Merge pull request #5366 from tsiegleauq/motion-not-switching-state

Browse Source 
Change motion cr mode view behavior
This commit is contained in:
Emanuel Schütze 2020-05-14 08:25:01 +02:00 committed by GitHub
commit 621d0f4e1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
View File

@ -532,9 +532,11 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
this.configService this.configService
.get<LineNumberingMode>('motions_default_line_numbering') .get<LineNumberingMode>('motions_default_line_numbering')
.subscribe(mode => (this.lnMode = mode)); .subscribe(mode => (this.lnMode = mode));
this.configService this.configService.get<ChangeRecoMode>('motions_recommendation_text_mode').subscribe(mode => {
.get<ChangeRecoMode>('motions_recommendation_text_mode') if (mode) {
.subscribe(mode => (this.crMode = this.determineCrMode(mode))); this.crMode = this.determineCrMode(mode);
}
});
this.configService this.configService
.get<boolean>('motions_show_sequential_numbers') .get<boolean>('motions_show_sequential_numbers')
.subscribe(shown => (this.showSequential = shown)); .subscribe(shown => (this.showSequential = shown));
@ -674,7 +676,9 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
// allChangingObjects, we set "diff" first in this case (in the config-listener) and perform the actual // allChangingObjects, we set "diff" first in this case (in the config-listener) and perform the actual
// check if "diff" is possible now. // check if "diff" is possible now.
// Test: "diff" as default view. Open a motion, create an amendment. "Original" should be set automatically. // Test: "diff" as default view. Open a motion, create an amendment. "Original" should be set automatically.
this.crMode = this.determineCrMode(this.crMode); if (this.crMode) {
this.crMode = this.determineCrMode(this.crMode);
}
this.cd.markForCheck(); this.cd.markForCheck();
} }
@ -1531,13 +1535,22 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
* Tries to determine the realistic CR-Mode from a given CR mode * Tries to determine the realistic CR-Mode from a given CR mode
*/ */
private determineCrMode(mode: ChangeRecoMode): ChangeRecoMode { private determineCrMode(mode: ChangeRecoMode): ChangeRecoMode {
if (this.motion) { if (mode === ChangeRecoMode.Final) {
if (mode === ChangeRecoMode.Final && this.motion.modified_final_version) { if (this.motion?.modified_final_version) {
return ChangeRecoMode.ModifiedFinal; return ChangeRecoMode.ModifiedFinal;
} /**
if ((mode === ChangeRecoMode.Diff || mode === ChangeRecoMode.Changed) && !this.allChangingObjects.length) { * Because without change recos you cannot escape the final version anymore
*/
} else if (!this.allChangingObjects?.length) {
return ChangeRecoMode.Original; return ChangeRecoMode.Original;
} }
} else if (mode === ChangeRecoMode.Changed && !this.allChangingObjects?.length) {
/**
* Because without change recos you cannot escape the changed version view
* You will not be able to automatically change to the Changed view after creating
* a change reco. The autoupdate has to come "after" this routine
*/
return ChangeRecoMode.Original;
} }
return mode; return mode;
} }