Remove presence stuff, hide amendment button

OpenSlides · Apr 10, 2024 · 185b2a8 · 185b2a8
1 parent 229c80e
commit 185b2a8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/...ings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts b/...ings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts
@@ -171,7 +171,11 @@ export class MotionPermissionService {
                     return false;
                 }
                 return (
-                    this.operator.hasPerms(Permission.motionCanCreateAmendments) &&
+                    this.operator.hasPerms(
+                        this.operator.isAllowedWithDelegation(`users_forbid_delegator_as_submitter`)
+                            ? Permission.motionCanCreateAmendments
+                            : Permission.motionCanManage
+                    ) &&
                     this._amendmentEnabled &&
                     (!motion.lead_motion_id || (!!motion.lead_motion_id && this._amendmentOfAmendmentEnabled))
                 );

diff --git a/...ges/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts b/...ges/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts
@@ -912,23 +912,23 @@ export const meetingSettings: SettingsGroup[] = fillInSettingsDefaults([
                         key: `users_forbid_delegator_in_list_of_speakers`,
                         label: _(`Restrict delegation principals from adding themselves to the list of speakers.`),
                         helpText: _(
-                            `Enabling this will cause non-present participants, whose voting rights have been delegated, to be unable to add themselves to any list of speakers unless they have managing rights.`
+                            `Enabling this will cause participants, whose voting rights have been delegated, to be unable to add themselves to any list of speakers unless they have managing rights.`
                         ),
                         type: `boolean`
                     },
                     {
                         key: `users_forbid_delegator_as_submitter`,
                         label: _(`Restrict delegation principals from creating motions.`),
                         helpText: _(
-                            `Enabling this will cause non-present participants, whose voting rights have been delegated, to be unable to create motions unless they have managing rights.`
+                            `Enabling this will cause participants, whose voting rights have been delegated, to be unable to create motions unless they have managing rights.`
                         ),
                         type: `boolean`
                     },
                     {
                         key: `users_forbid_delegator_as_supporter`,
                         label: _(`Restrict delegation principals from supporting motions.`),
                         helpText: _(
-                            `Enabling this will cause non-present participants, whose voting rights have been delegated, to be unable to support motions unless they have managing rights.`
+                            `Enabling this will cause participants, whose voting rights have been delegated, to be unable to support motions unless they have managing rights.`
                         ),
                         type: `boolean`
                     }

diff --git a/client/src/app/site/services/operator.service.ts b/client/src/app/site/services/operator.service.ts
@@ -571,7 +571,6 @@ export class OperatorService {
 
     public isAllowedWithDelegation(...appliedSettings: DelegationSetting[]): boolean {
         return (
-            this.user.isPresentInMeeting(this.activeMeetingId) ||
             !this.user.getMeetingUser(this.activeMeetingId)?.vote_delegated_to_id ||
             !appliedSettings.some(appliedSetting => this.meetingSettings.instant(appliedSetting as keyof Settings))
         );

diff --git a/client/src/app/ui/directives/perms/perms.directive.ts b/client/src/app/ui/directives/perms/perms.directive.ts
@@ -76,13 +76,11 @@ export class PermsDirective extends BasePermsDirective<Permission> implements On
      * Returns true if the users permissions fit.
      */
     protected hasPermissions(): boolean {
-        console.log(`HAS PERM`, this.permissions);
         let permissions = this.permissions;
         if (
             this._delegationSettingAlternative &&
             !this.operator.isAllowedWithDelegation(this._delegationSettingAlternative[0])
         ) {
-            console.log(`->`, this._delegationSettingAlternative[1]);
             permissions = [this._delegationSettingAlternative[1]];
         }
         return this.operator.hasPerms(...permissions);