Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Maják
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TO
Maják
Commits
dc78acba
Commit
dc78acba
authored
3 years ago
by
jan.bednarik
Browse files
Options
Downloads
Patches
Plain Diff
donate: Get subpage URL refactoring
parent
afdd0b64
No related branches found
Branches containing commit
No related tags found
2 merge requests
!216
Release
,
!215
Volby
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
donate/models.py
+5
-11
5 additions, 11 deletions
donate/models.py
shared/utils.py
+8
-0
8 additions, 0 deletions
shared/utils.py
with
13 additions
and
11 deletions
donate/models.py
+
5
−
11
View file @
dc78acba
...
@@ -21,6 +21,7 @@ from wagtail.images.edit_handlers import ImageChooserPanel
...
@@ -21,6 +21,7 @@ from wagtail.images.edit_handlers import ImageChooserPanel
from
wagtailmetadata.models
import
MetadataPageMixin
from
wagtailmetadata.models
import
MetadataPageMixin
from
shared.models
import
SubpageMixin
from
shared.models
import
SubpageMixin
from
shared.utils
import
get_subpage_url
from
tuning
import
help
from
tuning
import
help
from
.forms
import
DonateForm
from
.forms
import
DonateForm
...
@@ -73,13 +74,6 @@ class DonateFormAmountsMixin(models.Model):
...
@@ -73,13 +74,6 @@ class DonateFormAmountsMixin(models.Model):
abstract
=
True
abstract
=
True
def
get_url
(
page
,
dest_page_type
):
try
:
return
page
.
get_children
().
type
(
dest_page_type
).
live
().
first
().
get_url
()
except
(
Page
.
DoesNotExist
,
AttributeError
):
return
"
#
"
class
DonateHomePage
(
DonateFormMixin
,
DonateFormAmountsMixin
,
Page
,
MetadataPageMixin
):
class
DonateHomePage
(
DonateFormMixin
,
DonateFormAmountsMixin
,
Page
,
MetadataPageMixin
):
### FIELDS
### FIELDS
...
@@ -198,15 +192,15 @@ class DonateHomePage(DonateFormMixin, DonateFormAmountsMixin, Page, MetadataPage
...
@@ -198,15 +192,15 @@ class DonateHomePage(DonateFormMixin, DonateFormAmountsMixin, Page, MetadataPage
@property
@property
def
info_page_url
(
self
):
def
info_page_url
(
self
):
return
get_url
(
self
,
DonateInfoPage
)
return
get_
subpage_
url
(
self
,
DonateInfoPage
)
@property
@property
def
projects_page_url
(
self
):
def
projects_page_url
(
self
):
return
get_url
(
self
,
DonateProjectIndexPage
)
return
get_
subpage_
url
(
self
,
DonateProjectIndexPage
)
@property
@property
def
regions_page_url
(
self
):
def
regions_page_url
(
self
):
return
get_url
(
self
,
DonateRegionIndexPage
)
return
get_
subpage_
url
(
self
,
DonateRegionIndexPage
)
@property
@property
def
has_projects
(
self
):
def
has_projects
(
self
):
...
@@ -332,7 +326,7 @@ class DonateRegionPage(
...
@@ -332,7 +326,7 @@ class DonateRegionPage(
@property
@property
def
targeted_donations_page_url
(
self
):
def
targeted_donations_page_url
(
self
):
return
get_url
(
self
,
DonateTargetedDonationsPage
)
return
get_
subpage_
url
(
self
,
DonateTargetedDonationsPage
)
@property
@property
def
has_targeted_donations
(
self
):
def
has_targeted_donations
(
self
):
...
...
This diff is collapsed.
Click to expand it.
shared/utils.py
0 → 100644
+
8
−
0
View file @
dc78acba
from
wagtail.core.models
import
Page
def
get_subpage_url
(
page
,
dest_page_type
):
try
:
return
page
.
get_descendants
().
type
(
dest_page_type
).
live
().
first
().
get_url
()
except
(
Page
.
DoesNotExist
,
AttributeError
):
return
"
#
"
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