Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove need to use deprecated SiteMiddleware #53

Merged
merged 1 commit into from
Dec 10, 2020
Merged

Remove need to use deprecated SiteMiddleware #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions wagalytics/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def token(request, site_id=None):

if hasattr(settings, 'WAGALYTICS_SETTINGS'):
if site_id is None:
site_id = request.site.id
site_id = Site.find_for_request(request).id

wagalytics_settings = settings.WAGALYTICS_SETTINGS[site_id]

Expand Down Expand Up @@ -102,7 +102,7 @@ def dashboard(request, site_id=None):
if not site_id and (hasattr(settings, 'WAGALYTICS_SETTINGS') and len(settings.WAGALYTICS_SETTINGS) > 0):
# This site has multi-site wagalytics enabled.
# Redirect user to ^analytics/dashboard/{site_id}/$
return redirect('wagalytics_site_dashboard', site_id=request.site.id)
return redirect('wagalytics_site_dashboard', site_id=Site.find_for_request(request).id)

initial_start_date = (timezone.now() - datetime.timedelta(days=30)).strftime("%Y-%m-%d")
ga_view_id = None
Expand Down Expand Up @@ -135,7 +135,7 @@ def dashboard(request, site_id=None):
ga_view_id = settings.WAGALYTICS_SETTINGS[site.id]['GA_VIEW_ID']
else:
# The regular ^analytics/dashboard/$ url is being viewed.
site = Site.objects.get(hostname=request.site.hostname)
site = Site.objects.get(hostname=Site.find_for_request(request).hostname)
try:
ga_view_id = settings.GA_VIEW_ID
except AttributeError:
Expand Down