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

Merge pull request #3801 from normanjaeckel/FixAgenda

Browse Source 
Changed default agenda type for new topics.
This commit is contained in:
Emanuel Schütze 2018-08-22 17:47:09 +02:00 committed by GitHub
commit 11958c9d1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/access_permissions.py
View File

@ -83,7 +83,7 @@ class ItemAccessPermissions(BaseAccessPermissions):
if full['is_hidden'] and can_see_hidden: if full['is_hidden'] and can_see_hidden:
# Same filtering for internal and hidden items # Same filtering for internal and hidden items
data.append(filtered_data(full, blocked_keys_internal_hidden_case)) 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)) data.append(filtered_data(full, blocked_keys_internal_hidden_case))
else: # agenda item else: # agenda item
data.append(filtered_data(full, blocked_keys_non_internal_hidden_case)) data.append(filtered_data(full, blocked_keys_non_internal_hidden_case))

2
openslides/agenda/config_variables.py
View File

@ -67,7 +67,7 @@ def get_config_variables():
{'value': '1', 'display_name': 'Public item'}, {'value': '1', 'display_name': 'Public item'},
{'value': '2', 'display_name': 'Internal item'}, {'value': '2', 'display_name': 'Internal item'},
{'value': '3', 'display_name': 'Hidden 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, weight=227,
group='Agenda', group='Agenda',
subgroup='General') subgroup='General')

2
openslides/agenda/static/js/agenda/site.js
View File

@ -883,7 +883,7 @@ angular.module('OpenSlidesApp.agenda.site', [
gettext('[Begin speech] starts the countdown, [End speech] stops the ' + gettext('[Begin speech] starts the countdown, [End speech] stops the ' +
'countdown.'); 'countdown.');
gettext('Agenda visibility'); gettext('Agenda visibility');
gettext('Default visibility for new agenda items'); gettext('Default visibility for new agenda items (except topics)');
} }
]); ]);

3
openslides/topics/static/js/topics/site.js
View File

@ -185,7 +185,8 @@ angular.module('OpenSlidesApp.topics.site', ['OpenSlidesApp.topics', 'OpenSlides
'ErrorMessage', 'ErrorMessage',
function($scope, $state, Topic, TopicForm, Agenda, Config, ErrorMessage) { function($scope, $state, Topic, TopicForm, Agenda, Config, ErrorMessage) {
$scope.model = { $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 // get all form fields
$scope.formFields = TopicForm.getFormFields(true); $scope.formFields = TopicForm.getFormFields(true);

2
openslides/users/static/js/users/site.js
View File

@ -1810,7 +1810,7 @@ angular.module('OpenSlidesApp.users.site', [
gettext('Can see agenda'); gettext('Can see agenda');
gettext('Can manage agenda'); gettext('Can manage agenda');
gettext('Can manage list of speakers'); 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'); gettext('Can put oneself on the list of speakers');
// assignments // assignments
gettext('Can see elections'); gettext('Can see elections');