Changed default agenda type for new topics.
This commit is contained in:
parent
83295ebec1
commit
27e0564a23
@ -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))
|
||||
|
@ -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')
|
||||
|
@ -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)');
|
||||
}
|
||||
]);
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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');
|
||||
|
Loading…
Reference in New Issue
Block a user