diff --git a/lms/static/js/student_account/multiple_enterprise.js b/lms/static/js/student_account/multiple_enterprise.js index 535713395d..d56f69ec45 100644 --- a/lms/static/js/student_account/multiple_enterprise.js +++ b/lms/static/js/student_account/multiple_enterprise.js @@ -46,9 +46,12 @@ }).done(function() { view.redirect(next); }); + } else { + view.redirect(selectionPageUrl); } + } else { + view.redirect(selectionPageUrl); } - view.redirect(selectionPageUrl); } else { view.redirect(next); } diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 54a17c3726..c1d1a469c9 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -28,7 +28,7 @@ anyjson==0.3.3 # via kombu appdirs==1.4.3 # via fs attrs==19.3.0 # via -r requirements/edx/base.in, edx-ace babel==2.8.0 # via -r requirements/edx/base.in, django-babel, django-babel-underscore -beautifulsoup4==4.8.2 # via pynliner +beautifulsoup4==4.9.0 # via pynliner billiard==3.3.0.23 # via celery bleach==3.1.4 # via -r requirements/edx/base.in, edx-enterprise, lti-consumer-xblock, ora2 boto3==1.4.8 # via -r requirements/edx/base.in, fs-s3fs @@ -36,7 +36,7 @@ boto==2.39.0 # via -r requirements/edx/base.in, django-ses, edxval, botocore==1.8.17 # via -r requirements/edx/base.in, boto3, s3transfer git+https://github.com/edx/bridgekeeper.git@2423e8d8788c2132ebeec509e1a7b17e1f5b9364#egg=bridgekeeper==0.0 # via -r requirements/edx/github.in celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-celery, django-user-tasks, edx-celeryutils, edx-enterprise -certifi==2019.11.28 # via -r requirements/edx/paver.txt, requests +certifi==2020.4.5.1 # via -r requirements/edx/paver.txt, requests cffi==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, cryptography chardet==3.0.4 # via -r requirements/edx/paver.txt, pdfminer.six, pysrt, requests git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/github.in @@ -102,7 +102,7 @@ edx-django-release-util==0.4.2 # via -r requirements/edx/base.in edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.in edx-django-utils==3.1 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==5.0.2 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.0.5 # via -r requirements/edx/base.in +edx-enterprise==3.0.6 # via -r requirements/edx/base.in edx-i18n-tools==0.5.0 # via ora2 edx-milestones==0.2.6 # via -r requirements/edx/base.in edx-opaque-keys[django]==2.0.2 # via -r requirements/edx/paver.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, xmodule @@ -110,7 +110,7 @@ edx-organizations==5.0.0 # via -r requirements/edx/base.in edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.in edx-proctoring==2.3.3 # via -r requirements/edx/base.in, edx-proctoring-proctortrack edx-rbac==1.1.2 # via edx-enterprise -edx-rest-api-client==5.0.2 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring +edx-rest-api-client==5.1.0 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring edx-search==1.3.4 # via -r requirements/edx/base.in edx-sga==0.10.0 # via -r requirements/edx/base.in edx-submissions==3.0.6 # via -r requirements/edx/base.in, ora2 @@ -133,7 +133,7 @@ httplib2==0.17.1 # via oauth2 icalendar==4.0.5 # via -r requirements/edx/base.in idna==2.9 # via -r requirements/edx/paver.txt, requests importlib-metadata==1.6.0 # via -r requirements/edx/paver.txt, path -inflection==0.3.1 # via drf-yasg +inflection==0.4.0 # via drf-yasg ipaddress==1.0.23 # via -r requirements/edx/base.in isodate==0.6.0 # via python3-saml itypes==1.1.0 # via coreapi @@ -174,7 +174,7 @@ path.py==12.4.0 # via edx-enterprise, edx-i18n-tools, ora2, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, path.py pathtools==0.1.2 # via -r requirements/edx/paver.txt, watchdog paver==1.3.4 # via -r requirements/edx/paver.txt -pbr==5.4.4 # via -r requirements/edx/paver.txt, stevedore +pbr==5.4.5 # via -r requirements/edx/paver.txt, stevedore pdfminer.six==20200402 # via -r requirements/edx/base.in piexif==1.1.3 # via -r requirements/edx/base.in pillow==7.1.1 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 01b54f876c..0aaff21bf9 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -31,7 +31,7 @@ appdirs==1.4.3 # via -r requirements/edx/testing.txt, fs, virtualenv astroid==2.3.3 # via -r requirements/edx/testing.txt, pylint, pylint-celery attrs==19.3.0 # via -r requirements/edx/testing.txt, edx-ace, jsonschema, pytest babel==2.8.0 # via -r requirements/edx/testing.txt, django-babel, django-babel-underscore, sphinx -beautifulsoup4==4.8.2 # via -r requirements/edx/testing.txt, pynliner +beautifulsoup4==4.9.0 # via -r requirements/edx/testing.txt, pynliner billiard==3.3.0.23 # via -r requirements/edx/testing.txt, celery bleach==3.1.4 # via -r requirements/edx/testing.txt, edx-enterprise, lti-consumer-xblock, ora2 bok-choy==1.0.1 # via -r requirements/edx/testing.txt @@ -40,7 +40,7 @@ boto==2.39.0 # via -r requirements/edx/testing.txt, django-ses, edx botocore==1.8.17 # via -r requirements/edx/testing.txt, boto3, s3transfer git+https://github.com/edx/bridgekeeper.git@2423e8d8788c2132ebeec509e1a7b17e1f5b9364#egg=bridgekeeper==0.0 # via -r requirements/edx/testing.txt celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-celery, django-user-tasks, edx-celeryutils, edx-enterprise -certifi==2019.11.28 # via -r requirements/edx/testing.txt, requests +certifi==2020.4.5.1 # via -r requirements/edx/testing.txt, requests cffi==1.14.0 # via -r requirements/edx/testing.txt, cryptography chardet==3.0.4 # via -r requirements/edx/testing.txt, pdfminer.six, pysrt, requests git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/testing.txt @@ -114,7 +114,7 @@ edx-django-release-util==0.4.2 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.4.3 # via -r requirements/edx/testing.txt edx-django-utils==3.1 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==5.0.2 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.0.5 # via -r requirements/edx/testing.txt +edx-enterprise==3.0.6 # via -r requirements/edx/testing.txt edx-i18n-tools==0.5.0 # via -r requirements/edx/testing.txt, ora2 edx-lint==1.4.1 # via -r requirements/edx/testing.txt edx-milestones==0.2.6 # via -r requirements/edx/testing.txt @@ -123,7 +123,7 @@ edx-organizations==5.0.0 # via -r requirements/edx/testing.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/testing.txt edx-proctoring==2.3.3 # via -r requirements/edx/testing.txt, edx-proctoring-proctortrack edx-rbac==1.1.2 # via -r requirements/edx/testing.txt, edx-enterprise -edx-rest-api-client==5.0.2 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring +edx-rest-api-client==5.1.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring edx-search==1.3.4 # via -r requirements/edx/testing.txt edx-sga==0.10.0 # via -r requirements/edx/testing.txt edx-sphinx-theme==1.5.0 # via -r requirements/edx/development.in @@ -159,7 +159,7 @@ imagesize==1.2.0 # via sphinx importlib-metadata==1.6.0 # via -r requirements/edx/testing.txt, importlib-resources, inflect, jsonschema, path, pluggy, pytest, pytest-randomly, tox, virtualenv importlib-resources==1.4.0 # via -r requirements/edx/testing.txt, virtualenv inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, jinja2-pluralize -inflection==0.3.1 # via -r requirements/edx/testing.txt, drf-yasg +inflection==0.4.0 # via -r requirements/edx/testing.txt, drf-yasg ipaddress==1.0.23 # via -r requirements/edx/testing.txt isodate==0.6.0 # via -r requirements/edx/testing.txt, python3-saml isort==4.3.21 # via -r requirements/edx/testing.txt, pylint @@ -210,7 +210,7 @@ path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requi pathlib2==2.3.5 # via -r requirements/edx/testing.txt, pytest pathtools==0.1.2 # via -r requirements/edx/testing.txt, watchdog paver==1.3.4 # via -r requirements/edx/testing.txt -pbr==5.4.4 # via -r requirements/edx/testing.txt, stevedore +pbr==5.4.5 # via -r requirements/edx/testing.txt, stevedore pdfminer.six==20200402 # via -r requirements/edx/testing.txt piexif==1.1.3 # via -r requirements/edx/testing.txt pillow==7.1.1 # via -r requirements/edx/testing.txt, edx-enterprise, edx-organizations @@ -287,7 +287,7 @@ social-auth-core==3.3.3 # via -r requirements/edx/testing.txt, social-auth-app git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef79318a6fa80ac2#egg=sorl-thumbnail # via -r requirements/edx/testing.txt sortedcontainers==2.1.0 # via -r requirements/edx/testing.txt, pdfminer.six soupsieve==2.0 # via -r requirements/edx/testing.txt, beautifulsoup4 -sphinx==2.4.4 # via edx-sphinx-theme, sphinxcontrib-httpdomain +sphinx==3.0.0 # via edx-sphinx-theme, sphinxcontrib-httpdomain sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx sphinxcontrib-htmlhelp==1.0.3 # via sphinx @@ -313,7 +313,7 @@ unidiff==0.5.5 # via -r requirements/edx/testing.txt, coverage-pytest uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg urllib3==1.25.8 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.1.5 # via -r requirements/edx/testing.txt -virtualenv==20.0.15 # via -r requirements/edx/testing.txt, tox +virtualenv==20.0.16 # via -r requirements/edx/testing.txt, tox voluptuous==0.11.7 # via -r requirements/edx/testing.txt, ora2 vulture==1.4 # via -r requirements/edx/development.in watchdog==0.10.2 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index a6233c071e..c1f3cb6976 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2019.11.28 # via requests +certifi==2020.4.5.1 # via requests chardet==3.0.4 # via requests edx-opaque-keys==2.0.2 # via -r requirements/edx/paver.in idna==2.9 # via requests @@ -17,7 +17,7 @@ more-itertools==8.2.0 # via zipp path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in pathtools==0.1.2 # via watchdog paver==1.3.4 # via -r requirements/edx/paver.in -pbr==5.4.4 # via stevedore +pbr==5.4.5 # via stevedore psutil==1.2.1 # via -r requirements/edx/paver.in pymongo==3.9.0 # via -r requirements/edx/paver.in, edx-opaque-keys python-memcached==1.59 # via -r requirements/edx/paver.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index d279a865bd..6c7b7a1732 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -30,7 +30,7 @@ appdirs==1.4.3 # via -r requirements/edx/base.txt, fs, virtualenv astroid==2.3.3 # via pylint, pylint-celery attrs==19.3.0 # via -r requirements/edx/base.txt, edx-ace, pytest babel==2.8.0 # via -r requirements/edx/base.txt, django-babel, django-babel-underscore -beautifulsoup4==4.8.2 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, pynliner +beautifulsoup4==4.9.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, pynliner billiard==3.3.0.23 # via -r requirements/edx/base.txt, celery bleach==3.1.4 # via -r requirements/edx/base.txt, edx-enterprise, lti-consumer-xblock, ora2 bok-choy==1.0.1 # via -r requirements/edx/testing.in @@ -39,7 +39,7 @@ boto==2.39.0 # via -r requirements/edx/base.txt, django-ses, edxval botocore==1.8.17 # via -r requirements/edx/base.txt, boto3, s3transfer git+https://github.com/edx/bridgekeeper.git@2423e8d8788c2132ebeec509e1a7b17e1f5b9364#egg=bridgekeeper==0.0 # via -r requirements/edx/base.txt celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-celery, django-user-tasks, edx-celeryutils, edx-enterprise -certifi==2019.11.28 # via -r requirements/edx/base.txt, requests +certifi==2020.4.5.1 # via -r requirements/edx/base.txt, requests cffi==1.14.0 # via -r requirements/edx/base.txt, cryptography chardet==3.0.4 # via -r requirements/edx/base.txt, pdfminer.six, pysrt, requests git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/base.txt @@ -110,7 +110,7 @@ edx-django-release-util==0.4.2 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.txt edx-django-utils==3.1 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==5.0.2 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.0.5 # via -r requirements/edx/base.txt +edx-enterprise==3.0.6 # via -r requirements/edx/base.txt edx-i18n-tools==0.5.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2 edx-lint==1.4.1 # via -r requirements/edx/testing.in edx-milestones==0.2.6 # via -r requirements/edx/base.txt @@ -119,7 +119,7 @@ edx-organizations==5.0.0 # via -r requirements/edx/base.txt edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.txt edx-proctoring==2.3.3 # via -r requirements/edx/base.txt, edx-proctoring-proctortrack edx-rbac==1.1.2 # via -r requirements/edx/base.txt, edx-enterprise -edx-rest-api-client==5.0.2 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring +edx-rest-api-client==5.1.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring edx-search==1.3.4 # via -r requirements/edx/base.txt edx-sga==0.10.0 # via -r requirements/edx/base.txt edx-submissions==3.0.6 # via -r requirements/edx/base.txt, ora2 @@ -153,7 +153,7 @@ idna==2.9 # via -r requirements/edx/base.txt, requests importlib-metadata==1.6.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, importlib-resources, inflect, path, pluggy, pytest, pytest-randomly, tox, virtualenv importlib-resources==1.4.0 # via virtualenv inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt, jinja2-pluralize -inflection==0.3.1 # via -r requirements/edx/base.txt, drf-yasg +inflection==0.4.0 # via -r requirements/edx/base.txt, drf-yasg ipaddress==1.0.23 # via -r requirements/edx/base.txt isodate==0.6.0 # via -r requirements/edx/base.txt, python3-saml isort==4.3.21 # via -r requirements/edx/testing.in, pylint @@ -201,7 +201,7 @@ path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requi pathlib2==2.3.5 # via pytest pathtools==0.1.2 # via -r requirements/edx/base.txt, watchdog paver==1.3.4 # via -r requirements/edx/base.txt -pbr==5.4.4 # via -r requirements/edx/base.txt, stevedore +pbr==5.4.5 # via -r requirements/edx/base.txt, stevedore pdfminer.six==20200402 # via -r requirements/edx/base.txt piexif==1.1.3 # via -r requirements/edx/base.txt pillow==7.1.1 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations @@ -291,7 +291,7 @@ unidiff==0.5.5 # via -r requirements/edx/testing.in, coverage-pytest- uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg urllib3==1.25.8 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.1.5 # via -r requirements/edx/base.txt -virtualenv==20.0.15 # via tox +virtualenv==20.0.16 # via tox voluptuous==0.11.7 # via -r requirements/edx/base.txt, ora2 watchdog==0.10.2 # via -r requirements/edx/base.txt wcwidth==0.1.9 # via pytest diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index f6630355e0..4294ef7b38 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2019.11.28 # via requests +certifi==2020.4.5.1 # via requests chardet==3.0.4 # via requests idna==2.9 # via requests requests==2.23.0 # via -r scripts/xblock/requirements.in