Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Paweljong
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Teckids
Projekt Hack-n-Fun
AlekSIS-App-Paweljong
Commits
a580d981
Commit
a580d981
authored
3 years ago
by
Tom Teichler
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into 17-info-mailing
parents
4ca65f10
48d10ec7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!9
Resolve "Info mailing"
Pipeline
#57536
canceled
3 years ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aleksis/apps/paweljong/forms.py
+8
-3
8 additions, 3 deletions
aleksis/apps/paweljong/forms.py
aleksis/apps/paweljong/urls.py
+10
-2
10 additions, 2 deletions
aleksis/apps/paweljong/urls.py
aleksis/apps/paweljong/views.py
+3
-1
3 additions, 1 deletion
aleksis/apps/paweljong/views.py
with
21 additions
and
6 deletions
aleksis/apps/paweljong/forms.py
+
8
−
3
View file @
a580d981
...
...
@@ -313,6 +313,7 @@ class RegisterEventAdditional(ExtensibleForm):
self
.
add_node_to_layout
(
node
)
self
.
__class__
.
layout_filled
=
True
class
RegisterEventFinancial
(
ExtensibleForm
):
"""
Form to register for an event.
"""
...
...
@@ -385,7 +386,9 @@ class RegisterEventConsent(ExtensibleForm):
label
=
_
(
"
I confirm that the retraction of the registration is not possible anymore
"
"
after {}
"
).
format
(
dateformat
.
format
(
event
.
date_retraction
,
formats
.
get_format
(
'
DATE_FORMAT
'
))),
).
format
(
dateformat
.
format
(
event
.
date_retraction
,
formats
.
get_format
(
"
DATE_FORMAT
"
))
),
)
self
.
fields
[
"
retraction_deadline
"
]
=
field_instance
node
=
Row
(
"
retraction_deadline
"
)
...
...
@@ -446,8 +449,10 @@ class RegisterEventAccount(SignupForm, ExtensibleForm):
last_name
=
forms
.
CharField
(
label
=
_
(
"
Last name
"
))
date_of_birth
=
forms
.
DateField
(
label
=
_
(
"
Date of birth
"
))
def
__init__
(
self
,
*
args
,
**
kwargs
):
super
().
__init__
(
*
args
,
**
kwargs
)
self
.
fields
[
"
username
"
].
help_text
=
_
(
"
The username must only contain lower case letters and numbers, and must begin with a letter.
"
)
self
.
fields
[
"
username
"
].
help_text
=
_
(
"
The username must only contain lower case letters and numbers,
"
"
and must begin with a letter.
"
)
This diff is collapsed.
Click to expand it.
aleksis/apps/paweljong/urls.py
+
10
−
2
View file @
a580d981
...
...
@@ -50,8 +50,16 @@ urlpatterns = [
),
path
(
"
misc/set_email_needed/<slug:slug>
"
,
views
.
set_email_needed
,
name
=
"
set_email_needed
"
),
path
(
"
misc/set_email_needed/
"
,
views
.
set_email_needed
,
name
=
"
set_email_needed_no_slug
"
),
path
(
"
account/register/start
"
,
views
.
AccountRegisterStart
.
as_view
(),
name
=
"
register_account_start
"
),
path
(
"
account/register
"
,
views
.
AccountRegisterWizardView
.
as_view
(
account_forms
,
condition_dict
=
account_conditions
),
name
=
"
register_account
"
),
path
(
"
account/register/start
"
,
views
.
AccountRegisterStart
.
as_view
(),
name
=
"
register_account_start
"
,
),
path
(
"
account/register
"
,
views
.
AccountRegisterWizardView
.
as_view
(
account_forms
,
condition_dict
=
account_conditions
),
name
=
"
register_account
"
,
),
path
(
"
events/feed
"
,
views
.
UpcomingEventsRSSFeed
(),
name
=
"
upcoming_events_rss_feed
"
),
path
(
"
events/create
"
,
views
.
CreateEventView
.
as_view
(),
name
=
"
create_event
"
),
path
(
"
events/manage
"
,
views
.
manage_events
,
name
=
"
manage_events
"
),
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/paweljong/views.py
+
3
−
1
View file @
a580d981
...
...
@@ -276,6 +276,7 @@ def set_email_needed(request, slug: Optional[str] = None):
def
is_email_needed
(
wizard
):
return
wizard
.
request
.
session
.
pop
(
"
email_needed
"
,
None
)
TEMPLATES
=
{
"
email
"
:
"
paweljong/event/register_wizard.html
"
,
"
register
"
:
"
paweljong/event/register_wizard.html
"
,
...
...
@@ -286,6 +287,7 @@ TEMPLATES = {
"
consent
"
:
"
paweljong/event/register_wizard_consent.html
"
,
}
class
AccountRegisterWizardView
(
SessionWizardView
):
template_name
=
"
paweljong/account_wizard.html
"
file_storage
=
settings
.
DEFAULT_FILE_STORAGE
...
...
@@ -357,7 +359,6 @@ class AccountRegisterWizardView(SessionWizardView):
"
last_name
"
:
cleaned_data_register
[
"
last_name
"
],
"
date_of_birth
"
:
cleaned_data_register
[
"
date_of_birth
"
],
},
)
return
redirect
(
"
index
"
)
...
...
@@ -764,6 +765,7 @@ class UpcomingEventsRSSFeed(Feed):
def
item_description
(
self
,
item
):
return
item
.
description
class
AccountRegisterStart
(
TemplateView
):
template_name
=
"
paweljong/register_start.html
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment