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
afc2d66d
Commit
afc2d66d
authored
Mar 01, 2013
by
Don Mitchell
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1578 from MITx/bug/christina/misc
Don't usurp ValidatingView's error handling.
parents
bba96ee1
d7c28bfa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
cms/static/js/views/settings/main_settings_view.js
+1
-1
cms/static/js/views/settings/settings_grading_view.js
+2
-4
No files found.
cms/static/js/views/settings/main_settings_view.js
View file @
afc2d66d
...
...
@@ -97,7 +97,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
}
var
newVal
=
new
Date
(
date
.
getTime
()
+
time
*
1000
);
if
(
!
cacheModel
.
has
(
fieldName
)
||
cacheModel
.
get
(
fieldName
).
getTime
()
!==
newVal
.
getTime
())
{
cacheModel
.
save
(
fieldName
,
newVal
,
{
error
:
CMS
.
ServerError
}
);
cacheModel
.
save
(
fieldName
,
newVal
);
}
}
};
...
...
cms/static/js/views/settings/settings_grading_view.js
View file @
afc2d66d
...
...
@@ -90,8 +90,7 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
setGracePeriod
:
function
(
event
)
{
event
.
data
.
clearValidationErrors
();
var
newVal
=
event
.
data
.
model
.
dateToGracePeriod
(
$
(
event
.
currentTarget
).
timepicker
(
'getTime'
));
if
(
event
.
data
.
model
.
get
(
'grace_period'
)
!=
newVal
)
event
.
data
.
model
.
save
(
'grace_period'
,
newVal
,
{
error
:
CMS
.
ServerError
});
if
(
event
.
data
.
model
.
get
(
'grace_period'
)
!=
newVal
)
event
.
data
.
model
.
save
(
'grace_period'
,
newVal
);
},
updateModel
:
function
(
event
)
{
if
(
!
this
.
selectorToField
[
event
.
currentTarget
.
id
])
return
;
...
...
@@ -227,8 +226,7 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
object
[
cutoff
[
'designation'
]]
=
cutoff
[
'cutoff'
]
/
100.0
;
return
object
;
},
{}),
{
error
:
CMS
.
ServerError
});
{}));
},
addNewGrade
:
function
(
e
)
{
...
...
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