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
71455f76
Commit
71455f76
authored
Dec 12, 2012
by
Don Mitchell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check for null dates before setting time in timepicker.
Remove syllabus as it's not instrumented.
parent
cd23c8f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
cms/static/js/views/settings/main_settings_view.js
+2
-2
cms/templates/settings.html
+2
-2
No files found.
cms/static/js/views/settings/main_settings_view.js
View file @
71455f76
...
@@ -220,7 +220,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
...
@@ -220,7 +220,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
timefield
.
on
(
'changeTime'
,
savefield
);
timefield
.
on
(
'changeTime'
,
savefield
);
datefield
.
datepicker
(
'setDate'
,
this
.
model
.
get
(
fieldName
));
datefield
.
datepicker
(
'setDate'
,
this
.
model
.
get
(
fieldName
));
timefield
.
timepicker
(
'setTime'
,
this
.
model
.
get
(
fieldName
));
if
(
this
.
model
.
has
(
fieldName
))
timefield
.
timepicker
(
'setTime'
,
this
.
model
.
get
(
fieldName
));
},
},
updateModel
:
function
(
event
)
{
updateModel
:
function
(
event
)
{
...
@@ -352,7 +352,7 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
...
@@ -352,7 +352,7 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
var
graceEle
=
this
.
$el
.
find
(
'#course-grading-graceperiod'
);
var
graceEle
=
this
.
$el
.
find
(
'#course-grading-graceperiod'
);
graceEle
.
timepicker
({
'timeFormat'
:
'H:i'
});
// init doesn't take setTime
graceEle
.
timepicker
({
'timeFormat'
:
'H:i'
});
// init doesn't take setTime
graceEle
.
timepicker
(
'setTime'
,
this
.
model
.
gracePeriodToDate
());
if
(
this
.
model
.
has
(
'grace_period'
))
graceEle
.
timepicker
(
'setTime'
,
this
.
model
.
gracePeriodToDate
());
return
this
;
return
this
;
},
},
...
...
cms/templates/settings.html
View file @
71455f76
...
@@ -180,7 +180,7 @@ from contentstore import utils
...
@@ -180,7 +180,7 @@ from contentstore import utils
</div>
</div>
</div>
</div>
<div
class=
"row row-col2"
>
<
!-- <
div class="row row-col2">
<label for="course-syllabus">Course Syllabus</label>
<label for="course-syllabus">Course Syllabus</label>
<div class="field">
<div class="field">
<div class="input input-existing">
<div class="input input-existing">
...
@@ -198,7 +198,7 @@ from contentstore import utils
...
@@ -198,7 +198,7 @@ from contentstore import utils
<span class="tip tip-inline">PDF formatting preferred</span>
<span class="tip tip-inline">PDF formatting preferred</span>
</div>
</div>
</div>
</div>
</div>
</div>
-->
</section>
<!-- .settings-details-schedule -->
</section>
<!-- .settings-details-schedule -->
<hr
class=
"divide"
/>
<hr
class=
"divide"
/>
...
...
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