Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
ecommerce
Commits
3e59f863
Commit
3e59f863
authored
Jun 21, 2016
by
Saleem Latif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support theme previews via URL parameter
parent
8437f234
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
105 additions
and
0 deletions
+105
-0
ecommerce/settings/base.py
+1
-0
ecommerce/theming/middleware.py
+22
-0
ecommerce/theming/tests/test_middleware.py
+82
-0
No files found.
ecommerce/settings/base.py
View file @
3e59f863
...
@@ -220,6 +220,7 @@ MIDDLEWARE_CLASSES = (
...
@@ -220,6 +220,7 @@ MIDDLEWARE_CLASSES = (
'simple_history.middleware.HistoryRequestMiddleware'
,
'simple_history.middleware.HistoryRequestMiddleware'
,
'threadlocals.middleware.ThreadLocalMiddleware'
,
'threadlocals.middleware.ThreadLocalMiddleware'
,
'ecommerce.theming.middleware.CurrentSiteThemeMiddleware'
,
'ecommerce.theming.middleware.CurrentSiteThemeMiddleware'
,
'ecommerce.theming.middleware.ThemePreviewMiddleware'
,
)
)
# END MIDDLEWARE CONFIGURATION
# END MIDDLEWARE CONFIGURATION
...
...
ecommerce/theming/middleware.py
View file @
3e59f863
...
@@ -16,3 +16,25 @@ class CurrentSiteThemeMiddleware(object):
...
@@ -16,3 +16,25 @@ class CurrentSiteThemeMiddleware(object):
def
process_request
(
self
,
request
):
def
process_request
(
self
,
request
):
request
.
site_theme
=
SiteTheme
.
get_theme
(
request
.
site
)
request
.
site_theme
=
SiteTheme
.
get_theme
(
request
.
site
)
class
ThemePreviewMiddleware
(
object
):
"""
Middleware for previewing themes. This middleware should be added after
CurrentSiteThemeMiddleware and SessionMiddleware.
"""
def
process_request
(
self
,
request
):
if
'clear-theme'
in
request
.
GET
and
'preview-theme'
in
request
.
session
:
del
request
.
session
[
'preview-theme'
]
preview_theme
=
request
.
GET
.
get
(
'preview-theme'
)
or
request
.
session
.
get
(
'preview-theme'
)
if
request
.
user
.
is_staff
and
preview_theme
:
request
.
session
[
'preview-theme'
]
=
preview_theme
request
.
site_theme
=
SiteTheme
(
site
=
getattr
(
request
,
'site'
,
None
),
theme_dir_name
=
preview_theme
,
)
ecommerce/theming/tests/test_middleware.py
0 → 100644
View file @
3e59f863
"""
Tests for theming middleware.
"""
from
django.core.urlresolvers
import
reverse
from
ecommerce.tests.testcases
import
TestCase
class
TestPreviewTheme
(
TestCase
):
"""
Test preview-theme and clear-theme parameters work as expected.
"""
def
setUp
(
self
):
"""
Clear static file finders cache and register cleanup methods.
"""
super
(
TestPreviewTheme
,
self
)
.
setUp
()
self
.
dashboard_index_url
=
reverse
(
'dashboard:index'
)
# create a user and log in
self
.
user
=
self
.
create_user
(
is_staff
=
True
)
self
.
client
.
login
(
username
=
self
.
user
.
username
,
password
=
self
.
password
)
def
tearDown
(
self
):
# clear any theme overrides
self
.
client
.
get
(
self
.
dashboard_index_url
+
'?clear-theme'
)
def
test_templates
(
self
):
"""
Test templates are overridden with preview theme.
"""
# Test default theme without preview theme parameters
self
.
assertContains
(
self
.
client
.
get
(
self
.
dashboard_index_url
),
"This is a Test Theme."
,
)
# Test test-theme-2 overrides via preview-theme
self
.
assertContains
(
self
.
client
.
get
(
self
.
dashboard_index_url
+
'?preview-theme=test-theme-2'
),
"This is second Test Theme."
,
)
# make sure once theme is accessed via preview-theme, it is stored in session data
self
.
assertContains
(
self
.
client
.
get
(
self
.
dashboard_index_url
),
"This is second Test Theme."
,
)
# test that clear-theme parameter clears any theme applied via preview-theme
# In this case once preview theme is cleared, we should be back to default theme
self
.
assertContains
(
self
.
client
.
get
(
self
.
dashboard_index_url
+
'?clear-theme'
),
"This is a Test Theme."
,
)
# Verify that theme clearing is persisted in the user's session.
self
.
assertContains
(
self
.
client
.
get
(
self
.
dashboard_index_url
),
"This is a Test Theme."
,
)
# Test test-theme-3 overrides via preview-theme
self
.
assertContains
(
self
.
client
.
get
(
self
.
dashboard_index_url
+
'?preview-theme=test-theme-3'
),
"This is third Test Theme in a separate theme directory."
,
)
# Test test-theme-2 overrides via preview-theme
self
.
assertContains
(
self
.
client
.
get
(
self
.
dashboard_index_url
+
'?preview-theme=test-theme-2'
),
"This is second Test Theme."
,
)
# make sure there is no error if theme specified by preview-theme parameter does not exist.
# If given theme does not exist then open source theme will be used not the default theme.
self
.
assertContains
(
self
.
client
.
get
(
self
.
dashboard_index_url
+
'?preview-theme=test-theme-non-existent'
),
"Dashboard"
,
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment