Skip to content
Snippets Groups Projects
Verified Commit 461ab817 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

bump core version

parent 17aec0f4
No related branches found
No related tags found
1 merge request!34Reformat
Pipeline #173231 failed
...@@ -98,12 +98,12 @@ export default { ...@@ -98,12 +98,12 @@ export default {
(v) => (v) =>
/^\w+([.!#$%&'*+-\/=?^_`{|}~]?\w+)*$/.test(v) || /^\w+([.!#$%&'*+-\/=?^_`{|}~]?\w+)*$/.test(v) ||
this.$t( this.$t(
"postbuero.mail_addresses.data_table.errors.local_part_invalid_characters" "postbuero.mail_addresses.data_table.errors.local_part_invalid_characters",
), ),
(v) => (v) =>
this.disallowedLocalParts.indexOf(v) === -1 || this.disallowedLocalParts.indexOf(v) === -1 ||
this.$t( this.$t(
"postbuero.mail_addresses.data_table.errors.local_part_disallowed" "postbuero.mail_addresses.data_table.errors.local_part_disallowed",
), ),
]; ];
}, },
......
...@@ -82,13 +82,13 @@ export default { ...@@ -82,13 +82,13 @@ export default {
}, },
{ {
text: this.$t( text: this.$t(
"postbuero.mail_domains.data_table.filters.only_public" "postbuero.mail_domains.data_table.filters.only_public",
), ),
value: true, value: true,
}, },
{ {
text: this.$t( text: this.$t(
"postbuero.mail_domains.data_table.filters.only_non_public" "postbuero.mail_domains.data_table.filters.only_non_public",
), ),
value: false, value: false,
}, },
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
return [ return [
(v) => (v) =>
/(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]/.test( /(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]/.test(
v v,
) || ) ||
this.$t("postbuero.mail_domains.data_table.errors.domain_invalid"), this.$t("postbuero.mail_domains.data_table.errors.domain_invalid"),
]; ];
......
...@@ -77,9 +77,8 @@ class MailAliasForPerson(MailAlias): ...@@ -77,9 +77,8 @@ class MailAliasForPerson(MailAlias):
related_name="local_mail_aliases", related_name="local_mail_aliases",
) )
def __str__(self) -> str: def __str__(self) -> str:
return f"{person}" return f"{self.person}"
def resolve(self, guardians: bool = False, **kwargs): def resolve(self, guardians: bool = False, **kwargs):
"""Resolve alias to the e-mail address of this person or its guardians.""" """Resolve alias to the e-mail address of this person or its guardians."""
...@@ -110,17 +109,14 @@ class MailAliasForGroup(MailAlias): ...@@ -110,17 +109,14 @@ class MailAliasForGroup(MailAlias):
verbose_name_plural = _("Mail aliases for groups") verbose_name_plural = _("Mail aliases for groups")
def __str__(self) -> str: def __str__(self) -> str:
return f"{person}" return f"{self.person}"
def resolve(self, guardians: bool = False, owners: bool = False, **kwargs): def resolve(self, guardians: bool = False, owners: bool = False, **kwargs):
"""Resolve alias to the addresses of this group's members, owners, or their guardians.""" """Resolve alias to the addresses of this group's members, owners, or their guardians."""
if not self.group: if not self.group:
return [] return []
if owners: pq = self.group.owners.all() if owners else self.group.members.all()
pq = self.group.owners.all()
else:
pq = self.group.members.all()
if guardians: if guardians:
pq = Person.objects.filter(children__in=pq) pq = Person.objects.filter(children__in=pq)
......
{
"name": "aleksis-builddeps",
"version": "1.0.0",
"dependencies": {
"@intlify/eslint-plugin-vue-i18n": "^2.0.0",
"eslint": "^8.26.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-vue": "^9.7.0",
"prettier": "^2.8.1",
"stylelint": "^14.14.0",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard": "^29.0.0"
}
}
...@@ -27,9 +27,10 @@ priority = "primary" ...@@ -27,9 +27,10 @@ priority = "primary"
name = "gitlab" name = "gitlab"
url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple" url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
priority = "supplemental" priority = "supplemental"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.10" python = "^3.10"
AlekSIS-Core = "^4.0.0.dev0" AlekSIS-Core = "^4.0.0.dev3"
[tool.poetry.plugins."aleksis.app"] [tool.poetry.plugins."aleksis.app"]
postbuero = "aleksis.apps.postbuero.apps:PostBueroConfig" postbuero = "aleksis.apps.postbuero.apps:PostBueroConfig"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment