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
8fc0590a
Commit
8fc0590a
authored
Dec 12, 2013
by
Zubair Afzal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set default value for empty integer/float fields
STUD-894
parent
a78400a8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
cms/static/coffee/spec/views/metadata_edit_spec.coffee
+11
-7
cms/static/js/views/metadata.js
+5
-0
No files found.
cms/static/coffee/spec/views/metadata_edit_spec.coffee
View file @
8fc0590a
...
...
@@ -49,7 +49,7 @@ define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "c
}
integerEntry
=
{
default_value
:
5
,
default_value
:
6
,
display_name
:
"Inputs"
,
explicitly_set
:
false
,
field_name
:
"num_inputs"
,
...
...
@@ -247,6 +247,11 @@ define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "c
expect
(
@
view
.
getValueFromEditor
()).
toBe
(
'always'
)
describe
"MetadataView.Number supports integer or float type and has clear functionality"
,
->
verifyValueAfterChanged
=
(
view
,
value
,
expectedResult
)
->
view
.
setValueInEditor
(
value
)
view
.
changed
()
expect
(
view
.
getValueFromEditor
()).
toBe
(
expectedResult
)
beforeEach
->
integerModel
=
new
MetadataModel
(
integerEntry
)
@
integerView
=
new
MetadataView
.
Number
({
model
:
integerModel
})
...
...
@@ -267,7 +272,7 @@ define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "c
assertCanUpdateView
(
@
floatView
,
"-2.4"
)
it
"has a clear method to revert to the model default"
,
->
assertClear
(
@
integerView
,
5
,
'5
'
)
assertClear
(
@
integerView
,
6
,
'6
'
)
assertClear
(
@
floatView
,
2.7
,
'2.7'
)
it
"has an update model method"
,
->
...
...
@@ -290,11 +295,6 @@ define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "c
verifyAttributes
(
@
floatView
,
1.3
,
.
1
,
100.2
)
it
"corrects values that are out of range"
,
->
verifyValueAfterChanged
=
(
view
,
value
,
expectedResult
)
->
view
.
setValueInEditor
(
value
)
view
.
changed
()
expect
(
view
.
getValueFromEditor
()).
toBe
(
expectedResult
)
verifyValueAfterChanged
(
@
integerView
,
'-4'
,
'1'
)
verifyValueAfterChanged
(
@
integerView
,
'1'
,
'1'
)
verifyValueAfterChanged
(
@
integerView
,
'0'
,
'1'
)
...
...
@@ -306,6 +306,10 @@ define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "c
verifyValueAfterChanged
(
@
floatView
,
'100.2'
,
'100.2'
)
verifyValueAfterChanged
(
@
floatView
,
'100.3'
,
'100.2'
)
it
"sets default values for integer and float fields that are empty"
,
->
verifyValueAfterChanged
(
@
integerView
,
''
,
'6'
)
verifyValueAfterChanged
(
@
floatView
,
''
,
'2.7'
)
it
"disallows invalid characters"
,
->
verifyValueAfterKeyPressed
=
(
view
,
character
,
reject
)
->
event
=
{
...
...
cms/static/js/views/metadata.js
View file @
8fc0590a
...
...
@@ -189,7 +189,9 @@ function(Backbone, _, MetadataModel, AbstractEditor, VideoList) {
changed
:
function
()
{
// Limit value to the range specified by min and max (necessary for browsers that aren't using polyfill).
// Prevent integer/float fields value to be empty (set them to their defaults)
var
value
=
this
.
getValueFromEditor
();
if
(
value
)
{
if
((
this
.
max
!==
undefined
)
&&
value
>
this
.
max
)
{
value
=
this
.
max
;
}
else
if
((
this
.
min
!=
undefined
)
&&
value
<
this
.
min
)
{
...
...
@@ -197,6 +199,9 @@ function(Backbone, _, MetadataModel, AbstractEditor, VideoList) {
}
this
.
setValueInEditor
(
value
);
this
.
updateModel
();
}
else
{
this
.
clear
();
}
}
});
...
...
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