Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-pipeline
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
OpenEdx
django-pipeline
Commits
6584caa1
Commit
6584caa1
authored
Jan 05, 2016
by
leonardoo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding the ability to disable the collector in develop
parent
6f661f07
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
pipeline/conf.py
+2
-0
pipeline/templatetags/pipeline.py
+2
-1
No files found.
pipeline/conf.py
View file @
6584caa1
...
@@ -13,6 +13,8 @@ from django.utils.six import string_types
...
@@ -13,6 +13,8 @@ from django.utils.six import string_types
DEFAULTS
=
{
DEFAULTS
=
{
'PIPELINE_ENABLED'
:
not
_settings
.
DEBUG
,
'PIPELINE_ENABLED'
:
not
_settings
.
DEBUG
,
'PIPELINE_COLLECTOR_ENABLED'
:
True
,
'PIPELINE_ROOT'
:
_settings
.
STATIC_ROOT
,
'PIPELINE_ROOT'
:
_settings
.
STATIC_ROOT
,
'PIPELINE_URL'
:
_settings
.
STATIC_URL
,
'PIPELINE_URL'
:
_settings
.
STATIC_URL
,
...
...
pipeline/templatetags/pipeline.py
View file @
6584caa1
...
@@ -56,7 +56,8 @@ class PipelineMixin(object):
...
@@ -56,7 +56,8 @@ class PipelineMixin(object):
method
=
getattr
(
self
,
"render_{0}"
.
format
(
package_type
))
method
=
getattr
(
self
,
"render_{0}"
.
format
(
package_type
))
return
method
(
package
,
package
.
output_filename
)
return
method
(
package
,
package
.
output_filename
)
else
:
else
:
default_collector
.
collect
(
self
.
request
)
if
settings
.
PIPELINE_COLLECTOR_ENABLED
:
default_collector
.
collect
(
self
.
request
)
packager
=
Packager
()
packager
=
Packager
()
method
=
getattr
(
self
,
"render_individual_{0}"
.
format
(
package_type
))
method
=
getattr
(
self
,
"render_individual_{0}"
.
format
(
package_type
))
...
...
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