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
497bb39f
Commit
497bb39f
authored
Aug 12, 2014
by
Mat Peterson
Committed by
Ben McMorran
Aug 21, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug in dismissing errored rerun notification and another with empty reruns fields
parent
18a6a048
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
cms/static/js/index.js
+1
-1
cms/static/js/views/course_rerun.js
+20
-1
No files found.
cms/static/js/index.js
View file @
497bb39f
...
...
@@ -4,7 +4,7 @@ require(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape"],
var
dismissNotification
=
function
(
e
)
{
e
.
preventDefault
();
$
.
ajax
({
url
:
$
(
'.dismiss-button'
)
.
data
(
'dismiss-link'
),
url
:
this
.
data
(
'dismiss-link'
),
type
:
'DELETE'
,
success
:
function
(
result
)
{
window
.
location
.
reload
()
...
...
cms/static/js/views/course_rerun.js
View file @
497bb39f
...
...
@@ -3,7 +3,7 @@ require(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape"],
var
saveRerunCourse
=
function
(
e
)
{
e
.
preventDefault
();
// One final check for e
mpty value
s
// One final check for e
rror
s
var
errors
=
_
.
reduce
(
[
'.rerun-course-name'
,
'.rerun-course-org'
,
'.rerun-course-number'
,
'.rerun-course-run'
],
function
(
acc
,
ele
)
{
...
...
@@ -133,6 +133,18 @@ require(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape"],
}
};
// Ensure that all fields are not empty
var
validateFilledFields
=
function
()
{
return
_
.
reduce
(
[
'.rerun-course-org'
,
'.rerun-course-number'
,
'.rerun-course-run'
,
'.rerun-course-name'
],
function
(
acc
,
ele
)
{
var
$ele
=
$
(
ele
);
return
$ele
.
val
().
length
!==
0
?
acc
:
false
;
},
true
);
};
// Handle validation asynchronously
_
.
each
(
[
'.rerun-course-org'
,
'.rerun-course-number'
,
'.rerun-course-run'
],
...
...
@@ -148,6 +160,9 @@ require(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape"],
var
error
=
validateCourseItemEncoding
(
$ele
.
val
());
setNewCourseFieldInErr
(
$ele
.
parent
(),
error
);
validateTotalCourseItemsLength
();
if
(
!
validateFilledFields
())
{
$
(
'.rerun-course-save'
).
addClass
(
'is-disabled'
);
}
});
}
);
...
...
@@ -156,6 +171,9 @@ require(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape"],
var
error
=
validateRequiredField
(
$name
.
val
());
setNewCourseFieldInErr
(
$name
.
parent
(),
error
);
validateTotalCourseItemsLength
();
if
(
!
validateFilledFields
())
{
$
(
'.rerun-course-save'
).
addClass
(
'is-disabled'
);
}
});
});
});
\ No newline at end of file
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