diff --git a/client/src/app/core/translate/marked-translations.ts b/client/src/app/core/translate/marked-translations.ts index 00f0a752a..a0279a0d1 100644 --- a/client/src/app/core/translate/marked-translations.ts +++ b/client/src/app/core/translate/marked-translations.ts @@ -347,7 +347,7 @@ _('Can manage motion polls'); // users _('Can see names of users'); -_('Can see extra data of users (e.g. present and comment)'); +_('Can see extra data of users (e.g. email and comment)'); _('Can manage users'); _('Can change its own password'); diff --git a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html index a9c4291cd..7a28d6f59 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html @@ -1,5 +1,5 @@

- {{ 'Submitters' | translate }} + {{ 'Submitters' | translate }}

{{ user.short_name }} - check_box - check_box + account_balance +
-

{{ 'Email' | translate }}

{{ user.email }}
+
- -
-

{{ 'Gender' | translate }}

- {{ user.gender | translate }} -
+ +
+

{{ 'Gender' | translate }}

+ {{ user.gender | translate }}
@@ -305,6 +307,12 @@ {{ user.vote_weight }} + +
+

{{ 'Username' | translate }}

+ {{ user.username }} +
+

{{ 'Initial password' | translate }}

@@ -312,18 +320,12 @@
-
+

{{ 'About me' | translate }}

- - -
-

{{ 'Username' | translate }}

- {{ user.username }} -
diff --git a/client/src/app/site/users/components/user-detail/user-detail.component.ts b/client/src/app/site/users/components/user-detail/user-detail.component.ts index 12c497b4f..9a2147a82 100644 --- a/client/src/app/site/users/components/user-detail/user-detail.component.ts +++ b/client/src/app/site/users/components/user-detail/user-detail.component.ts @@ -193,10 +193,10 @@ export class UserDetailComponent extends BaseViewComponent implements OnInit { * * actions might be: * - delete (deleting the user) (users.can_manage and not ownPage) - * - seeName (title, first, last) (user.can_see_name or ownPage) - * - seeOtherUsers (title, first, last) (user.can_see_name) - * - seeExtra (checkboxes, comment) (user.can_see_extra_data) - * - seePersonal (mail, username, about, gender, structure level) (user.can_see_extra_data or ownPage) + * - seeName (title, first, last, gender, about) (user.can_see_name or ownPage) + * - seeOtherUsers (title, first, last, gender, about) (user.can_see_name) + * - seeExtra (email, comment, is_active, last_email_send) (user.can_see_extra_data) + * - seePersonal (mail, username, structure level) (user.can_see_extra_data or ownPage) * - manage (everything) (user.can_manage) * - changePersonal (mail, username, about) (user.can_manage or ownPage) * - changePassword (user.can_change_password) diff --git a/client/src/styles.scss b/client/src/styles.scss index 2fc569c7f..887bbf083 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -80,6 +80,7 @@ body { h1, h2, h3, +h4, .title-font, .slidetitle h1, .slidetitle h2 { diff --git a/openslides/users/migrations/0014_user_rename_permission.py b/openslides/users/migrations/0014_user_rename_permission.py new file mode 100644 index 000000000..ab112b343 --- /dev/null +++ b/openslides/users/migrations/0014_user_rename_permission.py @@ -0,0 +1,29 @@ +# Generated by Django 2.2.12 on 2020-06-15 19:59 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("users", "0013_user_vote_weight"), + ] + + operations = [ + migrations.AlterModelOptions( + name="user", + options={ + "default_permissions": (), + "ordering": ("last_name", "first_name", "username"), + "permissions": ( + ("can_see_name", "Can see names of users"), + ( + "can_see_extra_data", + "Can see extra data of users (e.g. email and comment)", + ), + ("can_change_password", "Can change its own password"), + ("can_manage", "Can manage users"), + ), + }, + ), + ] diff --git a/openslides/users/models.py b/openslides/users/models.py index af89cc866..44794fe61 100644 --- a/openslides/users/models.py +++ b/openslides/users/models.py @@ -172,7 +172,7 @@ class User(RESTModelMixin, PermissionsMixin, AbstractBaseUser): ("can_see_name", "Can see names of users"), ( "can_see_extra_data", - "Can see extra data of users (e.g. present and comment)", + "Can see extra data of users (e.g. email and comment)", ), ("can_change_password", "Can change its own password"), ("can_manage", "Can manage users"), diff --git a/openslides/users/serializers.py b/openslides/users/serializers.py index f09611b6c..6c2f44949 100644 --- a/openslides/users/serializers.py +++ b/openslides/users/serializers.py @@ -26,11 +26,11 @@ USERCANSEESERIALIZER_FIELDS = ( "is_present", "is_committee", "vote_weight", + "gender", ) USERCANSEEEXTRASERIALIZER_FIELDS = USERCANSEESERIALIZER_FIELDS + ( - "gender", "email", "last_email_send", "comment",