Skip to content

Commit

Permalink
Add default to meeting/users_pdf_wlan_encryption (#1863)
Browse files Browse the repository at this point in the history
  • Loading branch information
reiterl authored Aug 15, 2023
1 parent d61950f commit 7b4a296
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions global/data/example-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@
"users_allow_self_set_present": true,
"users_pdf_welcometitle": "Welcome to OpenSlides",
"users_pdf_welcometext": "[Place for your welcome and help text.]",
"users_pdf_wlan_encryption": "",
"users_email_sender": "Openslides",
"users_email_subject": "OpenSlides access data",
"users_email_body": "Dear {name},\n\nthis is your personal OpenSlides login:\n\n{url}\nUsername: {username}\nPassword: {password}\n\n\nThis email was generated automatically.",
Expand Down
1 change: 1 addition & 0 deletions global/meta/models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1300,6 +1300,7 @@ meeting:
restriction_mode: B
users_pdf_wlan_encryption:
type: string
default: WPA
enum:
- ""
- WEP
Expand Down
4 changes: 2 additions & 2 deletions openslides_backend/models/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from openslides_backend.models import fields
from openslides_backend.models.base import Model

MODELS_YML_CHECKSUM = "5c16613cd811dc14025edcaeb4e8b2e2"
MODELS_YML_CHECKSUM = "6faa8e76b0382398e24bb2d4b7fdd0ae"


class Organization(Model):
Expand Down Expand Up @@ -551,7 +551,7 @@ class Meeting(Model):
users_pdf_wlan_ssid = fields.CharField()
users_pdf_wlan_password = fields.CharField()
users_pdf_wlan_encryption = fields.CharField(
constraints={"enum": ["", "WEP", "WPA", "nopass"]}
default="WPA", constraints={"enum": ["", "WEP", "WPA", "nopass"]}
)
users_email_sender = fields.CharField(default="OpenSlides")
users_email_replyto = fields.CharField()
Expand Down
1 change: 1 addition & 0 deletions tests/system/presenter/test_check_database_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def get_meeting_defaults(self) -> Dict[str, Any]:
"users_allow_self_set_present": True,
"users_pdf_welcometitle": "Welcome to OpenSlides",
"users_pdf_welcometext": "blablabla",
"users_pdf_wlan_encryption": "WPA",
"users_email_sender": "OpenSlides",
"users_email_subject": "OpenSlides access data",
"users_email_body": "blablabla",
Expand Down

0 comments on commit 7b4a296

Please sign in to comment.