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
b446f051
Commit
b446f051
authored
2 years ago
by
quido.zientek
Browse files
Options
Downloads
Patches
Plain Diff
[FIX] response, context
parent
a55b66ec
No related branches found
No related tags found
3 merge requests
!607
Pirati.cz
,
!593
Feature/5 ajax content na homepage
,
!575
Feature/pirati cz
Pipeline
#9481
passed
2 years ago
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
main/models.py
+35
-32
35 additions, 32 deletions
main/models.py
with
35 additions
and
32 deletions
main/models.py
+
35
−
32
View file @
b446f051
...
@@ -160,9 +160,7 @@ class MainHomePage(MenuMixin, ExtendedMetadataHomePageMixin, MetadataPageMixin,
...
@@ -160,9 +160,7 @@ class MainHomePage(MenuMixin, ExtendedMetadataHomePageMixin, MetadataPageMixin,
def
get_context
(
self
,
request
,
*
args
,
**
kwargs
):
def
get_context
(
self
,
request
,
*
args
,
**
kwargs
):
context
=
super
().
get_context
(
request
,
args
,
kwargs
)
context
=
super
().
get_context
(
request
,
args
,
kwargs
)
tweets_page
=
request
.
GET
.
get
(
'
page
'
,
1
)
context
[
"
tweet_list
"
]
=
Tweet
.
objects
.
order_by
(
"
-twitter_id
"
)[:
4
]
tweet_paginator
=
Paginator
(
Tweet
.
objects
.
order_by
(
"
-twitter_id
"
),
self
.
max_items
)
context
[
"
tweet_list
"
]
=
tweet_paginator
.
get_page
(
tweets_page
)
context
[
"
regions
"
]
=
REGION_CHOICES
context
[
"
regions
"
]
=
REGION_CHOICES
last_month
=
timezone
.
now
().
today
().
replace
(
day
=
1
)
-
timedelta
(
days
=
1
)
last_month
=
timezone
.
now
().
today
().
replace
(
day
=
1
)
-
timedelta
(
days
=
1
)
first_day_of_last_month
=
last_month
.
replace
(
day
=
1
)
first_day_of_last_month
=
last_month
.
replace
(
day
=
1
)
...
@@ -173,11 +171,7 @@ class MainHomePage(MenuMixin, ExtendedMetadataHomePageMixin, MetadataPageMixin,
...
@@ -173,11 +171,7 @@ class MainHomePage(MenuMixin, ExtendedMetadataHomePageMixin, MetadataPageMixin,
context
[
"
article_data_list
"
]
=
sorted_article_qs
[:
3
]
context
[
"
article_data_list
"
]
=
sorted_article_qs
[:
3
]
return
context
return
context
def
serve
(
self
,
request
,
*
args
,
**
kwargs
):
def
get_region_response
(
self
,
request
):
if
not
request
.
META
.
get
(
'
HTTP_X_REQUESTED_WITH
'
)
==
'
XMLHttpRequest
'
:
return
super
().
serve
(
request
,
*
args
,
**
kwargs
)
if
'
region
'
in
request
.
GET
:
last_month
=
timezone
.
now
().
today
().
replace
(
day
=
1
)
-
timedelta
(
days
=
1
)
last_month
=
timezone
.
now
().
today
().
replace
(
day
=
1
)
-
timedelta
(
days
=
1
)
first_day_of_last_month
=
last_month
.
replace
(
day
=
1
)
first_day_of_last_month
=
last_month
.
replace
(
day
=
1
)
if
request
.
GET
.
get
(
'
region
'
,
None
)
==
'
VSK
'
:
if
request
.
GET
.
get
(
'
region
'
,
None
)
==
'
VSK
'
:
...
@@ -195,7 +189,8 @@ class MainHomePage(MenuMixin, ExtendedMetadataHomePageMixin, MetadataPageMixin,
...
@@ -195,7 +189,8 @@ class MainHomePage(MenuMixin, ExtendedMetadataHomePageMixin, MetadataPageMixin,
'
html
'
:
render
(
request
,
'
main/includes/small_article_preview.html
'
,
context
).
content
.
decode
(
"
utf-8
"
)
'
html
'
:
render
(
request
,
'
main/includes/small_article_preview.html
'
,
context
).
content
.
decode
(
"
utf-8
"
)
}
}
return
JsonResponse
(
data
=
data
,
safe
=
False
)
return
JsonResponse
(
data
=
data
,
safe
=
False
)
else
:
def
get_twitter_response
(
self
,
request
):
tweet_paginator
=
Paginator
(
Tweet
.
objects
.
order_by
(
"
-twitter_id
"
),
self
.
max_items
)
tweet_paginator
=
Paginator
(
Tweet
.
objects
.
order_by
(
"
-twitter_id
"
),
self
.
max_items
)
tweet_page
=
tweet_paginator
.
get_page
(
request
.
GET
.
get
(
'
page
'
,
1
))
tweet_page
=
tweet_paginator
.
get_page
(
request
.
GET
.
get
(
'
page
'
,
1
))
context
=
{
context
=
{
...
@@ -208,6 +203,14 @@ class MainHomePage(MenuMixin, ExtendedMetadataHomePageMixin, MetadataPageMixin,
...
@@ -208,6 +203,14 @@ class MainHomePage(MenuMixin, ExtendedMetadataHomePageMixin, MetadataPageMixin,
}
}
return
JsonResponse
(
data
=
data
,
safe
=
False
)
return
JsonResponse
(
data
=
data
,
safe
=
False
)
def
serve
(
self
,
request
,
*
args
,
**
kwargs
):
if
not
request
.
META
.
get
(
'
HTTP_X_REQUESTED_WITH
'
)
==
'
XMLHttpRequest
'
:
return
super
().
serve
(
request
,
*
args
,
**
kwargs
)
if
'
region
'
in
request
.
GET
:
return
self
.
get_region_response
(
request
)
else
:
return
self
.
get_twitter_response
(
request
)
@cached_property
@cached_property
def
newsletter_subscribe_url
(
self
):
def
newsletter_subscribe_url
(
self
):
return
self
.
url
+
self
.
reverse_subpage
(
"
newsletter_subscribe
"
)
return
self
.
url
+
self
.
reverse_subpage
(
"
newsletter_subscribe
"
)
...
...
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