Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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
edx-platform
Commits
7245f769
Commit
7245f769
authored
Dec 04, 2017
by
Nimisha Asthagiri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix quality issues in ace_common
parent
7ef443f7
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
34 additions
and
6 deletions
+34
-6
openedx/core/djangoapps/ace_common/__init__.py
+5
-1
openedx/core/djangoapps/ace_common/apps.py
+6
-0
openedx/core/djangoapps/ace_common/template_context.py
+11
-2
openedx/core/djangoapps/ace_common/templatetags/ace.py
+3
-2
openedx/core/djangoapps/ace_common/tests/mixins.py
+1
-0
openedx/core/djangoapps/ace_common/tests/test_templatetags.py
+2
-0
openedx/core/djangoapps/ace_common/tests/test_tracking.py
+1
-0
openedx/core/djangoapps/ace_common/tracking.py
+5
-1
No files found.
openedx/core/djangoapps/ace_common/__init__.py
View file @
7245f769
default_app_config
=
'openedx.core.djangoapps.ace_common.apps.AceCommonConfig'
"""
ace_common is a Django App that provides common utilities and templates
for edx-platform applications that use ACE as their messaging framework.
"""
default_app_config
=
'openedx.core.djangoapps.ace_common.apps.AceCommonConfig'
# pylint: disable=invalid-name
openedx/core/djangoapps/ace_common/apps.py
View file @
7245f769
"""
Configuration for the ace_common Django app.
"""
from
django.apps
import
AppConfig
from
django.utils.translation
import
ugettext_lazy
as
_
class
AceCommonConfig
(
AppConfig
):
"""
Configuration class for the ace_common Django app.
"""
name
=
'openedx.core.djangoapps.ace_common'
verbose_name
=
_
(
'ACE Common'
)
openedx/core/djangoapps/ace_common/template_context.py
View file @
7245f769
"""
Context dictionary for templates that use the ace_common base template.
"""
from
django.conf
import
settings
from
django.core.urlresolvers
import
reverse
...
...
@@ -6,13 +9,19 @@ from openedx.core.djangoapps.theming.helpers import get_config_value_from_site_o
def
get_base_template_context
(
site
):
"""Dict with entries needed for all templates that use the base template"""
"""
Dict with entries needed for all templates that use the base template.
"""
return
{
# Platform information
'homepage_url'
:
marketing_link
(
'ROOT'
),
'dashboard_url'
:
reverse
(
'dashboard'
),
'template_revision'
:
getattr
(
settings
,
'EDX_PLATFORM_REVISION'
,
None
),
'platform_name'
:
get_config_value_from_site_or_settings
(
'PLATFORM_NAME'
,
site
=
site
,
site_config_name
=
'platform_name'
),
'platform_name'
:
get_config_value_from_site_or_settings
(
'PLATFORM_NAME'
,
site
=
site
,
site_config_name
=
'platform_name'
,
),
'contact_mailing_address'
:
get_config_value_from_site_or_settings
(
'CONTACT_MAILING_ADDRESS'
,
site
=
site
,
site_config_name
=
'contact_mailing_address'
),
'social_media_urls'
:
get_config_value_from_site_or_settings
(
'SOCIAL_MEDIA_FOOTER_URLS'
,
site
=
site
),
...
...
openedx/core/djangoapps/ace_common/templatetags/ace.py
View file @
7245f769
# pylint: disable=missing-docstring
from
urlparse
import
urlparse
from
crum
import
get_current_request
...
...
@@ -7,7 +8,7 @@ from django.utils.safestring import mark_safe
from
openedx.core.djangoapps.ace_common.tracking
import
CampaignTrackingInfo
,
GoogleAnalyticsTrackingPixel
from
openedx.core.djangolib.markup
import
HTML
register
=
template
.
Library
()
register
=
template
.
Library
()
# pylint: disable=invalid-name
@register.simple_tag
(
takes_context
=
True
)
...
...
@@ -133,7 +134,7 @@ def modify_url_to_track_clicks(url, campaign=None):
if
campaign
is
None
:
campaign
=
CampaignTrackingInfo
()
modified_url
=
parsed_url
.
_replace
(
query
=
campaign
.
to_query_string
(
parsed_url
.
query
))
return
modified_url
.
geturl
()
return
modified_url
.
geturl
()
# pylint: disable=no-member
def
ensure_url_is_absolute
(
site
,
relative_path
):
...
...
openedx/core/djangoapps/ace_common/tests/mixins.py
View file @
7245f769
# pylint: disable=missing-docstring
from
urlparse
import
parse_qs
,
urlparse
...
...
openedx/core/djangoapps/ace_common/tests/test_templatetags.py
View file @
7245f769
# pylint: disable=missing-docstring,no-member
import
uuid
from
django.http
import
HttpRequest
...
...
@@ -23,6 +24,7 @@ class TestAbsoluteUrl(CacheIsolationTestCase):
def
setUp
(
self
):
self
.
site
=
SiteFactory
.
create
()
self
.
site
.
domain
=
'example.com'
super
(
TestAbsoluteUrl
,
self
)
.
setUp
()
def
test_absolute_url
(
self
):
absolute
=
ensure_url_is_absolute
(
self
.
site
,
'/foo/bar'
)
...
...
openedx/core/djangoapps/ace_common/tests/test_tracking.py
View file @
7245f769
# pylint: disable=missing-docstring,no-member
from
unittest
import
TestCase
from
django.test
import
override_settings
...
...
openedx/core/djangoapps/ace_common/tracking.py
View file @
7245f769
# pylint: disable=missing-docstring
from
urlparse
import
parse_qs
import
attr
...
...
@@ -92,7 +93,10 @@ class GoogleAnalyticsTrackingPixel(object):
parameters
[
'tid'
]
=
tracking_id
user_id_dimension
=
get_config_value_from_site_or_settings
(
"GOOGLE_ANALYTICS_USER_ID_CUSTOM_DIMENSION"
,
site
=
self
.
site
)
user_id_dimension
=
get_config_value_from_site_or_settings
(
"GOOGLE_ANALYTICS_USER_ID_CUSTOM_DIMENSION"
,
site
=
self
.
site
,
)
if
user_id_dimension
is
not
None
and
self
.
user_id
is
not
None
:
parameter_name
=
'cd{0}'
.
format
(
user_id_dimension
)
parameters
[
parameter_name
]
=
self
.
user_id
...
...
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