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
a8aced9b
Commit
a8aced9b
authored
Sep 24, 2012
by
Victor Shnayder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Also make the actual ?next redirection work with caching
- use js instead of django to do the redirection
parent
0b40e751
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
9 deletions
+6
-9
lms/djangoapps/courseware/views.py
+0
-3
lms/envs/common.py
+1
-0
lms/templates/index.html
+0
-1
lms/templates/login_modal.html
+5
-5
No files found.
lms/djangoapps/courseware/views.py
View file @
a8aced9b
...
...
@@ -430,9 +430,6 @@ def university_profile(request, org_id):
context
=
dict
(
courses
=
courses
,
org_id
=
org_id
)
template_file
=
"university_profile/{0}.html"
.
format
(
org_id
)
.
lower
()
if
request
.
REQUEST
.
get
(
'next'
,
False
):
context
[
'show_login_immediately'
]
=
True
return
render_to_response
(
template_file
,
context
)
def
render_notifications
(
request
,
course
,
notifications
):
...
...
lms/envs/common.py
View file @
a8aced9b
...
...
@@ -525,6 +525,7 @@ PIPELINE_JS = {
'js/my_courses_dropdown.js'
,
'js/toggle_login_modal.js'
,
'js/sticky_filter.js'
,
'js/query-params.js'
,
],
'output_filename'
:
'js/lms-application.js'
},
...
...
lms/templates/index.html
View file @
a8aced9b
...
...
@@ -147,7 +147,6 @@
<
%
block
name=
"js_extra"
>
<script
type=
"text/javascript"
src=
"${static.url('js/query-params.js')}"
></script>
<script
type=
"text/javascript"
"
>
$
(
window
).
load
(
function
()
{
if
(
getParameterByName
(
'next'
))
{
...
...
lms/templates/login_modal.html
View file @
a8aced9b
...
...
@@ -46,11 +46,11 @@
(
function
()
{
$
(
document
).
delegate
(
'#login_form'
,
'ajax:success'
,
function
(
data
,
json
,
xhr
)
{
if
(
json
.
success
)
{
%
if
request
.
REQUEST
.
get
(
'next'
,
False
):
location
.
href
=
"${request.REQUEST.get('next')}"
;
%
else
:
location
.
href
=
"${reverse('dashboard')}"
;
%
endif
if
(
getParameterByName
(
'next'
))
{
location
.
href
=
getParameterByName
(
'next'
)
;
}
else
{
location
.
href
=
"${reverse('dashboard')}"
;
}
}
else
{
if
(
$
(
'#login_error'
).
length
==
0
)
{
$
(
'#login_form'
).
prepend
(
'<div id="login_error" class="modal-form-error"></div>'
);
...
...
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