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
59daa1c0
Commit
59daa1c0
authored
Dec 21, 2016
by
Gregory Martin
Committed by
GitHub
Dec 21, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14189 from edx/yro_student-acct-timezone-fix
change variable name
parents
e860205e
ce76e2c3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
lms/static/js/spec/student_account/account_settings_fields_spec.js
+1
-1
lms/static/js/student_account/views/account_settings_factory.js
+1
-1
lms/templates/fields/field_dropdown_account.underscore
+2
-2
No files found.
lms/static/js/spec/student_account/account_settings_fields_spec.js
View file @
59daa1c0
...
...
@@ -55,7 +55,7 @@ define(['backbone',
groupOptions
:
[{
groupTitle
:
gettext
(
'All Time Zones'
),
selectOptions
:
FieldViewsSpecHelpers
.
SELECT_OPTIONS
,
blankTitle
:
'Default (Local Time Zone)'
nullValueOptionLabel
:
'Default (Local Time Zone)'
}],
persistChanges
:
true
,
required
:
true
...
...
lms/static/js/student_account/views/account_settings_factory.js
View file @
59daa1c0
...
...
@@ -119,7 +119,7 @@
groupOptions
:
[{
groupTitle
:
gettext
(
'All Time Zones'
),
selectOptions
:
fieldsData
.
time_zone
.
options
,
blankTitle
:
gettext
(
'Default (Local Time Zone)'
)
nullValueOptionLabel
:
gettext
(
'Default (Local Time Zone)'
)
}],
persistChanges
:
true
})
...
...
lms/templates/fields/field_dropdown_account.underscore
View file @
59daa1c0
...
...
@@ -22,8 +22,8 @@
<select name="select" id="u-field-select-<%- id %>" aria-describedby="u-field-help-message-<%- id %>">
<% _.each(groupOptions, function(groupOption) { %>
<% if (showBlankOption) { %>
<% if (groupOption.
blankTitle
) { %>
<option value=""><%- groupOption.
blankTitle
%></option>
<% if (groupOption.
nullValueOptionLabel
) { %>
<option value=""><%- groupOption.
nullValueOptionLabel
%></option>
<% } else { %>
<option value=""></option>
<% } %>
...
...
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