Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • Teckids/hacknfun/AlekSIS-App-Paweljong
  • 8sercomcurro/AlekSIS-App-Paweljong
  • gassungtholbuy/AlekSIS-App-Paweljong
  • inturnickterc/AlekSIS-App-Paweljong
  • 3vibbergulyo/AlekSIS-App-Paweljong
  • 9fulcvoZdendmi/AlekSIS-App-Paweljong
  • 8stagitWriate/AlekSIS-App-Paweljong
  • 9sorneWpersma/AlekSIS-App-Paweljong
  • imelKgeshi/AlekSIS-App-Paweljong
  • ceotremagi/AlekSIS-App-Paweljong
  • niebutdiscchi/AlekSIS-App-Paweljong
  • plusultesetz/AlekSIS-App-Paweljong
  • 7tiadeKplicpu/AlekSIS-App-Paweljong
  • grehanbeci/AlekSIS-App-Paweljong
  • inocpuhaw/AlekSIS-App-Paweljong
  • 7inenprobko/AlekSIS-App-Paweljong
  • _weblate/AlekSIS-App-Paweljong
17 results
Show changes
Commits on Source (5)
...@@ -8,6 +8,7 @@ from django_select2.forms import ModelSelect2MultipleWidget, ModelSelect2Widget ...@@ -8,6 +8,7 @@ from django_select2.forms import ModelSelect2MultipleWidget, ModelSelect2Widget
from material import Fieldset, Layout, Row from material import Fieldset, Layout, Row
from phonenumber_field.formfields import PhoneNumberField from phonenumber_field.formfields import PhoneNumberField
from aleksis.apps.tezor.models.base import Client
from aleksis.apps.tezor.models.invoice import InvoiceGroup from aleksis.apps.tezor.models.invoice import InvoiceGroup
from aleksis.core.mixins import ExtensibleForm from aleksis.core.mixins import ExtensibleForm
from aleksis.core.models import Group, Person from aleksis.core.models import Group, Person
...@@ -349,9 +350,17 @@ class RegisterEventFinancial(ExtensibleForm): ...@@ -349,9 +350,17 @@ class RegisterEventFinancial(ExtensibleForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields["payment_method"].choices = InvoiceGroup.objects.get( # FIXME Maybe do not hard-code this
name="Hack'n'Fun-Veranstaltungen" client, __ = Client.objects.get_or_create(name="Teckids e.V.")
).get_variant_choices() group, __ = InvoiceGroup.objects.get_or_create(
name="Hack'n'Fun-Veranstaltungen",
client=client,
defaults={
"template_name": "paweljong/invoice_pdf.html",
},
)
self.fields["payment_method"].choices = group.get_variant_choices()
class Meta: class Meta:
model = EventRegistration model = EventRegistration
......
# Generated by Django 4.2.10 on 2024-03-03 16:20
import colorfield.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("paweljong", "0026_drop_sites"),
]
operations = [
migrations.CreateModel(
name="PaweljongGlobalPermissions",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
],
options={
"permissions": (
("generate_lists", "Can generate lists of participants of a group"),
),
"managed": False,
},
),
]
...@@ -15,7 +15,7 @@ from payments import PurchasedItem ...@@ -15,7 +15,7 @@ from payments import PurchasedItem
from aleksis.apps.tezor.models.base import Client from aleksis.apps.tezor.models.base import Client
from aleksis.apps.tezor.models.invoice import Invoice, InvoiceGroup from aleksis.apps.tezor.models.invoice import Invoice, InvoiceGroup
from aleksis.core.mixins import ExtensibleModel from aleksis.core.mixins import ExtensibleModel, GlobalPermissionModel
from aleksis.core.models import Group, Person from aleksis.core.models import Group, Person
from aleksis.core.util.core_helpers import generate_random_code, get_site_preferences from aleksis.core.util.core_helpers import generate_random_code, get_site_preferences
from aleksis.core.util.email import send_email from aleksis.core.util.email import send_email
...@@ -460,3 +460,11 @@ class Checkpoint(ExtensibleModel): ...@@ -460,3 +460,11 @@ class Checkpoint(ExtensibleModel):
lon = models.DecimalField( lon = models.DecimalField(
max_digits=11, decimal_places=8, verbose_name=_("Longitude of check"), blank=True, null=True max_digits=11, decimal_places=8, verbose_name=_("Longitude of check"), blank=True, null=True
) )
class PaweljongGlobalPermissions(GlobalPermissionModel):
class Meta:
managed = False
permissions = (
("generate_lists", _("Can generate lists of participants of a group")),
)
...@@ -237,6 +237,12 @@ create_registration_states_predicate = has_person & ( ...@@ -237,6 +237,12 @@ create_registration_states_predicate = has_person & (
) )
rules.add_perm("paweljong.create_registration_states_rule", create_registration_states_predicate) rules.add_perm("paweljong.create_registration_states_rule", create_registration_states_predicate)
# Generate lists
generate_lists_predicate = has_person & (
has_global_perm("paweljong.generate_lists")
)
rules.add_perm("paweljong.generate_lists_rule", generate_lists_predicate)
# View menu # View menu
can_view_menu_predicate = has_person & ( can_view_menu_predicate = has_person & (
view_info_mailings_predicate view_info_mailings_predicate
...@@ -244,6 +250,7 @@ can_view_menu_predicate = has_person & ( ...@@ -244,6 +250,7 @@ can_view_menu_predicate = has_person & (
| view_vouchers_predicate | view_vouchers_predicate
| change_events_predicate | change_events_predicate
| view_registration_states_predicate | view_registration_states_predicate
| generate_lists_predicate
) )
rules.add_perm("paweljong.view_menu", can_view_menu_predicate) rules.add_perm("paweljong.view_menu", can_view_menu_predicate)
......