diff --git a/openslides/agenda/access_permissions.py b/openslides/agenda/access_permissions.py index 89a47a3b7..26689b8e6 100644 --- a/openslides/agenda/access_permissions.py +++ b/openslides/agenda/access_permissions.py @@ -83,7 +83,7 @@ class ItemAccessPermissions(BaseAccessPermissions): if full['is_hidden'] and can_see_hidden: # Same filtering for internal and hidden items data.append(filtered_data(full, blocked_keys_internal_hidden_case)) - if full['is_internal']: + elif full['is_internal']: data.append(filtered_data(full, blocked_keys_internal_hidden_case)) else: # agenda item data.append(filtered_data(full, blocked_keys_non_internal_hidden_case)) diff --git a/openslides/agenda/config_variables.py b/openslides/agenda/config_variables.py index e47cf9c78..d52db6f08 100644 --- a/openslides/agenda/config_variables.py +++ b/openslides/agenda/config_variables.py @@ -67,7 +67,7 @@ def get_config_variables(): {'value': '1', 'display_name': 'Public item'}, {'value': '2', 'display_name': 'Internal item'}, {'value': '3', 'display_name': 'Hidden item'}), - label='Default visibility for new agenda items', + label='Default visibility for new agenda items (except topics)', weight=227, group='Agenda', subgroup='General') diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js index b5d41755d..2735aabdf 100644 --- a/openslides/agenda/static/js/agenda/site.js +++ b/openslides/agenda/static/js/agenda/site.js @@ -883,7 +883,7 @@ angular.module('OpenSlidesApp.agenda.site', [ gettext('[Begin speech] starts the countdown, [End speech] stops the ' + 'countdown.'); gettext('Agenda visibility'); - gettext('Default visibility for new agenda items'); + gettext('Default visibility for new agenda items (except topics)'); } ]); diff --git a/openslides/topics/static/js/topics/site.js b/openslides/topics/static/js/topics/site.js index 5c70fb084..627bee0a7 100644 --- a/openslides/topics/static/js/topics/site.js +++ b/openslides/topics/static/js/topics/site.js @@ -185,7 +185,8 @@ angular.module('OpenSlidesApp.topics.site', ['OpenSlidesApp.topics', 'OpenSlides 'ErrorMessage', function($scope, $state, Topic, TopicForm, Agenda, Config, ErrorMessage) { $scope.model = { - agenda_type: parseInt(Config.get('agenda_new_items_default_visibility').value), + agenda_type: 1, // Default is a public item. The config field + // 'agenda_new_items_default_visibility' is not used. }; // get all form fields $scope.formFields = TopicForm.getFormFields(true); diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js index 6f158b7a6..e9a3df953 100644 --- a/openslides/users/static/js/users/site.js +++ b/openslides/users/static/js/users/site.js @@ -1810,7 +1810,7 @@ angular.module('OpenSlidesApp.users.site', [ gettext('Can see agenda'); gettext('Can manage agenda'); gettext('Can manage list of speakers'); - gettext('Can see hidden items and time scheduling of agenda'); + gettext('Can see internal items and time scheduling of agenda'); gettext('Can put oneself on the list of speakers'); // assignments gettext('Can see elections');