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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TO
Maják
Commits
01775e63
Commit
01775e63
authored
1 year ago
by
Alexa Valentová
Browse files
Options
Downloads
Patches
Plain Diff
add automatic redirects, fix menu iterator (again)
parent
1a0555e0
No related branches found
No related tags found
2 merge requests
!997
Release
,
!995
Release
Pipeline
#18620
passed
1 year ago
Stage: build
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
district/models.py
+15
-6
15 additions, 6 deletions
district/models.py
shared/models/main.py
+7
-2
7 additions, 2 deletions
shared/models/main.py
with
22 additions
and
8 deletions
district/models.py
+
15
−
6
View file @
01775e63
import
json
import
json
from
django.http
import
HttpResponseRedirect
from
django.core.cache
import
cache
from
django.core.cache
import
cache
from
django.core.exceptions
import
ValidationError
from
django.core.exceptions
import
ValidationError
from
django.db
import
models
from
django.db
import
models
...
@@ -1099,25 +1100,33 @@ class DistrictGeoFeatureDetailPage(
...
@@ -1099,25 +1100,33 @@ class DistrictGeoFeatureDetailPage(
# Legacy models required for migrations
# Legacy models required for migrations
class
DistrictElectionRootPage
(
Page
):
class
LegacyProgramPageMixin
(
Page
):
def
serve
(
self
,
request
,
*
args
,
**
kwargs
):
return
HttpResponseRedirect
(
"
/programy/
"
)
class
Meta
:
abstract
=
True
class
DistrictElectionRootPage
(
LegacyProgramPageMixin
,
Page
):
pass
pass
class
DistrictProgramPage
(
Page
):
class
DistrictProgramPage
(
LegacyProgramPageMixin
,
Page
):
pass
pass
class
DistrictInteractiveProgramPage
(
Page
):
class
DistrictInteractiveProgramPage
(
LegacyProgramPageMixin
,
Page
):
pass
pass
class
DistrictElectionCampaignPage
(
Page
):
class
DistrictElectionCampaignPage
(
LegacyProgramPageMixin
,
Page
):
pass
pass
class
DistrictElectionProgramPage
(
Page
):
class
DistrictElectionProgramPage
(
LegacyProgramPageMixin
,
Page
):
pass
pass
class
DistrictPostElectionStrategyPage
(
Page
):
class
DistrictPostElectionStrategyPage
(
LegacyProgramPageMixin
,
Page
):
pass
pass
This diff is collapsed.
Click to expand it.
shared/models/main.py
+
7
−
2
View file @
01775e63
...
@@ -250,7 +250,11 @@ class PageInMenuMixin(Page):
...
@@ -250,7 +250,11 @@ class PageInMenuMixin(Page):
menu_iterator
=
(
menu_iterator
=
(
instance
.
root_page
.
menu
instance
.
root_page
.
menu
if
hasattr
(
instance
,
"
root_page
"
)
if
hasattr
(
instance
,
"
root_page
"
)
else
instance
.
menu
else
(
instance
.
menu
if
hasattr
(
instance
,
"
menu
"
)
else
[]
)
)
)
for
menu
in
menu_iterator
:
for
menu
in
menu_iterator
:
...
@@ -268,9 +272,10 @@ class PageInMenuMixin(Page):
...
@@ -268,9 +272,10 @@ class PageInMenuMixin(Page):
if
item
[
"
page
"
].
id
==
instance
.
id
:
if
item
[
"
page
"
].
id
==
instance
.
id
:
return
menu
.
value
[
"
title
"
]
return
menu
.
value
[
"
title
"
]
parent
=
instance
.
get_parent
()
.
specific
parent
=
instance
.
get_parent
()
if
parent
:
if
parent
:
parent
=
parent
.
specific
return
self
.
get_menu_title
(
parent
)
return
self
.
get_menu_title
(
parent
)
return
self
.
title
return
self
.
title
...
...
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