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
d8a974b6
Commit
d8a974b6
authored
Aug 03, 2017
by
Brittney Exline
Committed by
GitHub
Aug 03, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15715 from edx/saleem-latif/ENT-555
ENT-555: Continue button is not appearing on registration page.
parents
0dddf9eb
04c11cc1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
lms/djangoapps/student_account/test/test_views.py
+1
-0
lms/djangoapps/student_account/views.py
+2
-0
lms/static/js/student_account/views/RegisterView.js
+4
-1
lms/templates/student_account/register.underscore
+3
-1
No files found.
lms/djangoapps/student_account/test/test_views.py
View file @
d8a974b6
...
...
@@ -591,6 +591,7 @@ class StudentAccountLoginAndRegistrationTest(ThirdPartyAuthTestMixin, UrlResetMi
"secondaryProviders"
:
[],
"finishAuthUrl"
:
finish_auth_url
,
"errorMessage"
:
None
,
"registerFormSubmitButtonText"
:
"Create Account"
,
}
if
expected_ec
is
not
None
:
# If we set an EnterpriseCustomer, third-party auth providers ought to be hidden.
...
...
lms/djangoapps/student_account/views.py
View file @
d8a974b6
...
...
@@ -316,6 +316,7 @@ def _third_party_auth_context(request, redirect_to, tpa_hint=None):
"secondaryProviders"
:
[],
"finishAuthUrl"
:
None
,
"errorMessage"
:
None
,
"registerFormSubmitButtonText"
:
_
(
"Create Account"
),
}
if
third_party_auth
.
is_enabled
():
...
...
@@ -361,6 +362,7 @@ def _third_party_auth_context(request, redirect_to, tpa_hint=None):
)
.
format
(
configuration_helpers
.
get_value
(
'PLATFORM_NAME'
,
settings
.
PLATFORM_NAME
)
)
context
[
"registerFormSubmitButtonText"
]
=
_
(
"Continue"
)
# Check for any error messages we may want to display:
for
msg
in
messages
.
get_messages
(
request
):
...
...
lms/static/js/student_account/views/RegisterView.js
View file @
d8a974b6
...
...
@@ -58,6 +58,8 @@
this
.
autoSubmit
=
data
.
thirdPartyAuth
.
autoSubmitRegForm
;
this
.
hideAuthWarnings
=
data
.
hideAuthWarnings
;
this
.
autoRegisterWelcomeMessage
=
data
.
thirdPartyAuth
.
autoRegisterWelcomeMessage
||
''
;
this
.
registerFormSubmitButtonText
=
data
.
thirdPartyAuth
.
registerFormSubmitButtonText
||
_
(
'Create Account'
);
this
.
listenTo
(
this
.
model
,
'sync'
,
this
.
saveSuccess
);
this
.
listenTo
(
this
.
model
,
'validation'
,
this
.
renderLiveValidations
);
...
...
@@ -77,7 +79,8 @@
providers
:
this
.
providers
,
hasSecondaryProviders
:
this
.
hasSecondaryProviders
,
platformName
:
this
.
platformName
,
autoRegisterWelcomeMessage
:
this
.
autoRegisterWelcomeMessage
autoRegisterWelcomeMessage
:
this
.
autoRegisterWelcomeMessage
,
registerFormSubmitButtonText
:
this
.
registerFormSubmitButtonText
}
}));
...
...
lms/templates/student_account/register.underscore
View file @
d8a974b6
...
...
@@ -51,5 +51,7 @@
<%= context.fields %>
<button type="submit" class="action action-primary action-update js-register register-button"><%- gettext("Create account") %></button>
<button type="submit" class="action action-primary action-update js-register register-button">
<% if ( context.registerFormSubmitButtonText ) { %><%- context.registerFormSubmitButtonText %><% } else { %><%- gettext("Create Account") %><% } %>
</button>
</form>
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