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

Merge pull request #4306 from tsiegleauq/show-state-extension-of-null

Browse Source 
Fix some production mode issues
This commit is contained in:
Emanuel Schütze 2019-02-12 11:16:38 +01:00 committed by GitHub
commit 2e80cc34a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app/core/repositories/motions/motion-repository.service.ts
View File

@ -859,6 +859,9 @@ export class MotionRepositoryService extends BaseRepository<ViewMotion, Motion>
* @returns the translated state with the extension attached
*/
public getExtendedStateLabel(motion: ViewMotion): string {
if (!motion.state) {
return null;
}
let state = this.translate.instant(motion.state.name);
if (motion.stateExtension && motion.state.show_state_extension_field) {
state += ' ' + this.solveExtensionPlaceHolder(motion.stateExtension);

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

@ -236,7 +236,7 @@
<mat-basic-chip [matMenuTriggerFor]="stateMenu" [ngClass]="getStateCssColor()">
{{ stateLabel }}
</mat-basic-chip>
<div *ngIf="motion.state.show_state_extension_field" class="spacer-top-10">
<div *ngIf="motion.state && motion.state.show_state_extension_field" class="spacer-top-10">
<mat-form-field>
<input matInput placeholder="{{ 'Extension' | translate }}" [(ngModel)]="newStateExtension" />
</mat-form-field>

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

@ -1179,7 +1179,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
*/
public canFollowRecommendation(): boolean {
if (
this.perms.isAllowed('createPoll', this.motion) &&
this.perms.isAllowed('createpoll', this.motion) &&
this.motion.recommendation &&
this.motion.recommendation.recommendation_label
) {

54
client/src/app/site/motions/services/local-permissions.service.ts
View File

@ -57,34 +57,47 @@ export class LocalPermissionsService {
*/
public isAllowed(action: string, motion?: ViewMotion): boolean {
switch (action) {
case 'create':
case 'create': {
return this.operator.hasPerms('motions.can_create');
case 'support':
if (!motion) {
}
case 'support': {
if (!motion || !motion.state) {
return false;
}
return (
this.operator.hasPerms('motions.can_support') &&
this.configMinSupporters > 0 &&
motion.state &&
motion.state.allow_support &&
motion.submitters &&
motion.submitters.indexOf(this.operator.viewUser) === -1 &&
motion.supporters &&
motion.supporters.indexOf(this.operator.viewUser) === -1
);
case 'unsupport':
}
case 'unsupport': {
if (!motion) {
return false;
}
return motion.state.allow_support && motion.supporters.indexOf(this.operator.viewUser) !== -1;
case 'createpoll':
return (
motion.state &&
motion.state.allow_support &&
motion.supporters &&
motion.supporters.indexOf(this.operator.viewUser) !== -1
);
}
case 'createpoll': {
if (!motion) {
return false;
}
return (
(this.operator.hasPerms('motions.can_manage') ||
this.operator.hasPerms('motions.can_manage_metadata')) &&
motion.state &&
motion.state.allow_create_poll
);
case 'update':
}
case 'update': {
// check also for empty ViewMotion object (e.g. if motion.id is null)
// important for creating new motion as normal user
if (!motion || !motion.id) {
@ -97,18 +110,23 @@ export class LocalPermissionsService {
motion.submitters &&
motion.submitters.some(submitter => submitter.id === this.operator.user.id))
);
case 'update_submitters':
}
case 'update_submitters': {
return this.operator.hasPerms('motions.can_manage');
case 'delete':
}
case 'delete': {
if (!motion) {
return false;
}
return (
this.operator.hasPerms('motions.can_manage') &&
motion.state &&
motion.state.allow_submitter_edit &&
motion.submitters &&
motion.submitters.some(submitter => submitter.id === this.operator.user.id)
);
case 'change_state':
}
case 'change_state': {
// check also for empty ViewMotion object (e.g. if motion.id is null)
// important for creating new motion as normal user
if (!motion || !motion.id) {
@ -122,12 +140,14 @@ export class LocalPermissionsService {
motion.submitters &&
motion.submitters.some(submitter => submitter.id === this.operator.user.id))
);
case 'change_metadata':
}
case 'change_metadata': {
return (
this.operator.hasPerms('motions.can_manage') ||
this.operator.hasPerms('motions.can_manage_metadata')
);
case 'can_create_amendments':
}
case 'can_create_amendments': {
if (!motion) {
return false;
}
@ -136,15 +156,19 @@ export class LocalPermissionsService {
this.amendmentEnabled &&
(!motion.parent_id || (motion.parent_id && this.amendmentOfAmendment))
);
case 'can_manage_metadata':
}
case 'can_manage_metadata': {
return (
this.operator.hasPerms('motions.can_manage') &&
this.operator.hasPerms('motions.can_manage_metadata')
);
case 'manage':
}
case 'manage': {
return this.operator.hasPerms('motions.can_manage');
default:
}
default: {
return false;
}
}
}
}