Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-wiki
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-wiki
Commits
beb75715
Commit
beb75715
authored
Mar 29, 2013
by
benjaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use HttpResponseRedirectBase anyways, just check status_code
parent
6da0fd98
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
wiki/decorators.py
+3
-6
No files found.
wiki/decorators.py
View file @
beb75715
...
@@ -2,10 +2,6 @@
...
@@ -2,10 +2,6 @@
from
django.core.urlresolvers
import
reverse
from
django.core.urlresolvers
import
reverse
from
django.http
import
HttpResponse
,
HttpResponseNotFound
,
\
from
django.http
import
HttpResponse
,
HttpResponseNotFound
,
\
HttpResponseForbidden
HttpResponseForbidden
try
:
from
django.http
import
HttpResponseRedirectBase
except
ImportError
:
from
django.http.response
import
HttpResponseRedirectBase
from
django.shortcuts
import
redirect
,
get_object_or_404
from
django.shortcuts
import
redirect
,
get_object_or_404
from
django.template.context
import
RequestContext
from
django.template.context
import
RequestContext
...
@@ -20,11 +16,12 @@ from django.utils.http import urlquote
...
@@ -20,11 +16,12 @@ from django.utils.http import urlquote
def
json_view
(
func
):
def
json_view
(
func
):
def
wrap
(
request
,
*
args
,
**
kwargs
):
def
wrap
(
request
,
*
args
,
**
kwargs
):
obj
=
func
(
request
,
*
args
,
**
kwargs
)
obj
=
func
(
request
,
*
args
,
**
kwargs
)
if
isinstance
(
obj
,
HttpResponse
RedirectBase
):
if
isinstance
(
obj
,
HttpResponse
):
# Special behaviour: If it's a redirect, for instance
# Special behaviour: If it's a redirect, for instance
# because of login protection etc. just return
# because of login protection etc. just return
# the redirect
# the redirect
return
obj
if
obj
.
status_code
==
301
or
obj
.
status_code
==
302
:
return
obj
data
=
json
.
dumps
(
obj
,
ensure_ascii
=
False
)
data
=
json
.
dumps
(
obj
,
ensure_ascii
=
False
)
status
=
kwargs
.
get
(
'status'
,
200
)
status
=
kwargs
.
get
(
'status'
,
200
)
response
=
HttpResponse
(
mimetype
=
'application/json'
,
status
=
status
)
response
=
HttpResponse
(
mimetype
=
'application/json'
,
status
=
status
)
...
...
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