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

Merge pull request #4779 from MaximilianKrambach/sequentialNumber

Browse Source 
config to show/hide motion sequential numbers
This commit is contained in:
Emanuel Schütze 2019-06-14 14:21:27 +02:00 committed by GitHub
commit ded7bac4f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
View File

@ -113,9 +113,12 @@
<!-- Sequential number -->
<span class="main-nav-color title-font">
<span translate>Sequential number</span>&nbsp;{{ motion.id }}
<span *ngIf="showSequential">
<span translate>Sequential number</span>
&nbsp;{{ motion.id }}
</span>
<span *ngIf="showSequential && motion.parent_id">&#xb7;&nbsp;</span>
<span *ngIf="motion.parent_id">
&#xb7;
<span>
<span translate>Amendment to</span>&nbsp;<a [routerLink]="motion.parent.getDetailStateURL()">{{
motion.parent.identifier || motion.parent.title

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

@ -163,6 +163,11 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
*/
public statutesEnabled: boolean;
/**
* Value of the config variable `motions_show_sequential_numbers`
*/
public showSequential: boolean;
/**
* Value of the config variable `motions_reason_required`
*/
@ -493,7 +498,9 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
this.configService
.get<ChangeRecoMode>('motions_recommendation_text_mode')
.subscribe(mode => (this.crMode = mode));
this.configService
.get<boolean>('motions_show_sequential_numbers')
.subscribe(shown => (this.showSequential = shown));
// disable the selector for attachments if there are none
this.mediafilesObserver.subscribe(() => {
if (this.contentForm) {

2
client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html
View File

@ -90,7 +90,7 @@
<!-- Submitters -->
<div class="submitters-line ellipsis-overflow" *ngIf="motion.submitters.length">
<span translate>by</span> {{ motion.submitters }}
<span *osPerms="'motions.can_manage'">
<span *ngIf="showSequential">
&middot;
<span translate>Sequential number</span>
{{ motion.id }}

9
client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts
View File

@ -116,6 +116,12 @@ export class MotionListComponent extends ListViewBaseComponent<ViewMotion> imple
* @TODO replace by direct access to config variable, once it's available from the templates
*/
public statutesEnabled: boolean;
/**
* Value of the config variable `motions_show_sequential_numbers`
*/
public showSequential: boolean;
public recommendationEnabled: boolean;
public tags: ViewTag[] = [];
@ -212,6 +218,9 @@ export class MotionListComponent extends ListViewBaseComponent<ViewMotion> imple
this.configService.get<string>('motions_recommendations_by').subscribe(recommender => {
this.recommendationEnabled = !!recommender;
});
this.configService
.get<boolean>('motions_show_sequential_numbers')
.subscribe(show => (this.showSequential = show));
this.motionBlockRepo.getViewModelListObservable().subscribe(mBs => {
this.motionBlocks = mBs;
});

10
openslides/motions/config_variables.py
View File

@ -190,6 +190,16 @@ def get_config_variables():
subgroup="General",
)
yield ConfigVariable(
name="motions_show_sequential_numbers",
default_value=True,
input_type="boolean",
label="Show the sequential number for a motion",
weight=336,
group="Motions",
subgroup="General",
)
# Amendments
yield ConfigVariable(