Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18087 from edx/release-mergeback-to-master

Browse Source 
Merge release back to master
This commit is contained in:
Cory Lee
2018-04-27 17:52:15 -04:00
committed by GitHub
parent 239177a5f5 c16cbd7a54
commit d400b47ed8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
View File

@@ -10,7 +10,7 @@ function LoggedInUser({ userInformation, setErrorState, zendeskApiHost, submitFo
if (userInformation.enrollments) {
courseElement = (<div>
<label className="label-course" htmlFor="course">{gettext('Course Name')}</label>
<select className="form-control select-course" id="course" value={userInformation.course_id}>
<select className="form-control select-course" id="course" defaultValue={userInformation.course_id}>
<option key="select-course" value="">--------</option>
<option key="not-course-specific" value="Not specific to a course">
{gettext('Not specific to a course')}
@@ -74,12 +74,12 @@ function LoggedInUser({ userInformation, setErrorState, zendeskApiHost, submitFo
</div>
</div>
{/*TODO file uploading will be done after initial release*/}
{/*<FileUpload*/}
{/*setErrorState={setErrorState}*/}
{/*zendeskApiHost={zendeskApiHost}*/}
{/*accessToken={accessToken}*/}
{/*/>*/}
{/* TODO file uploading will be done after initial release */}
{/* <FileUpload */}
{/* setErrorState={setErrorState} */}
{/* zendeskApiHost={zendeskApiHost} */}
{/* accessToken={accessToken} */}
{/* /> */}
<div className="row">
<div className="col-sm-12">