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

Merge pull request #6141 from jsangmeister/fix-number-fields

Browse Source 
Fix initial data for conference_auto_connect_next_speakers and datavalidator for number fields
This commit is contained in:
Sean 2021-07-01 16:03:25 +02:00 committed by GitHub
commit fb9e9513fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/initial-data.json
View File

@ -112,7 +112,7 @@
"conference_stream_poster_url": "", "conference_stream_poster_url": "",
"conference_open_microphone": true, "conference_open_microphone": true,
"conference_open_video": true, "conference_open_video": true,
"conference_auto_connect_next_speakers": true, "conference_auto_connect_next_speakers": 0,
"projector_countdown_default_time": 60, "projector_countdown_default_time": 60,
"projector_countdown_warning_time": 0, "projector_countdown_warning_time": 0,

4
docs/datavalidator/check_json.py
View File

@ -50,11 +50,11 @@ def check_color(value: Any) -> bool:
def check_number(value: Any) -> bool: def check_number(value: Any) -> bool:
return value is None or isinstance(value, int) return value is None or type(value) == int
def check_float(value: Any) -> bool: def check_float(value: Any) -> bool:
return value is None or isinstance(value, int) or isinstance(value, float) return value is None or type(value) in (int, float)
def check_boolean(value: Any) -> bool: def check_boolean(value: Any) -> bool:

2
docs/example-data.json
View File

@ -248,7 +248,7 @@
"conference_stream_poster_url": "", "conference_stream_poster_url": "",
"conference_open_microphone": true, "conference_open_microphone": true,
"conference_open_video": true, "conference_open_video": true,
"conference_auto_connect_next_speakers": true, "conference_auto_connect_next_speakers": 0,
"jitsi_room_name": "", "jitsi_room_name": "",
"jitsi_domain": "", "jitsi_domain": "",