From 4766c88e92a7436d48db6a4487bcf904ee8dbc40 Mon Sep 17 00:00:00 2001 From: Diana Catalina Olarte Date: Thu, 25 Aug 2022 19:31:20 -0500 Subject: [PATCH 1/8] feat uptadate env patches to yml syntax --- tutordistro/patches/cms-env | 4 ++-- tutordistro/patches/lms-env | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutordistro/patches/cms-env b/tutordistro/patches/cms-env index 6de6827..8935924 100644 --- a/tutordistro/patches/cms-env +++ b/tutordistro/patches/cms-env @@ -1,2 +1,2 @@ -"USE_EOX_TENANT": true, -"DEFAULT_SITE_THEME": "bragi" +USE_EOX_TENANT: True +DEFAULT_SITE_THEME: "bragi" diff --git a/tutordistro/patches/lms-env b/tutordistro/patches/lms-env index 1c10c26..5cd310c 100644 --- a/tutordistro/patches/lms-env +++ b/tutordistro/patches/lms-env @@ -1,4 +1,4 @@ -"USE_EOX_TENANT": true, -"DEFAULT_SITE_THEME": "bragi", -"ENABLE_EOX_THEMING_DERIVE_WORKAROUND": true, -"SESSION_COOKIE_DOMAIN": ".{{ LMS_HOST|common_domain(CMS_HOST) }}" +USE_EOX_TENANT: True +DEFAULT_SITE_THEME: "bragi" +ENABLE_EOX_THEMING_DERIVE_WORKAROUND: True +SESSION_COOKIE_DOMAIN: ".{{ LMS_HOST|common_domain(CMS_HOST) }}" From 2bcd78f6a17f86fb7861c559362d4e65c80f307c Mon Sep 17 00:00:00 2001 From: Diana Catalina Olarte Date: Mon, 29 Aug 2022 12:46:26 -0500 Subject: [PATCH 2/8] feat: add distro nuez compatibility and add eox-tenant --- setup.py | 2 +- tests/test_distro.py | 2 +- tutordistro/patches/cms-env | 1 - tutordistro/patches/lms-env | 1 - .../patches/openedx-dockerfile-pre-assets | 2 - tutordistro/plugin.py | 151 +----------------- .../templates/distro/tasks/lms/pre-init | 5 +- 7 files changed, 10 insertions(+), 154 deletions(-) diff --git a/setup.py b/setup.py index e55f3d6..8fc6c04 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ def load_about(): packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.6", - install_requires=["tutor>=13.0.0, <14", "click"], + install_requires=["tutor>=14.0.5, <15", "click"], extras_require={ "test": ["behave", "pytest", "pylint"] }, diff --git a/tests/test_distro.py b/tests/test_distro.py index 86e9fe0..556db9f 100644 --- a/tests/test_distro.py +++ b/tests/test_distro.py @@ -9,4 +9,4 @@ def test_version(): """ Tutor distro plugin tests version """ - assert __version__ == '0.1.0' + assert __version__ == '2.2.0' diff --git a/tutordistro/patches/cms-env b/tutordistro/patches/cms-env index 8935924..d1618af 100644 --- a/tutordistro/patches/cms-env +++ b/tutordistro/patches/cms-env @@ -1,2 +1 @@ USE_EOX_TENANT: True -DEFAULT_SITE_THEME: "bragi" diff --git a/tutordistro/patches/lms-env b/tutordistro/patches/lms-env index 5cd310c..e90432a 100644 --- a/tutordistro/patches/lms-env +++ b/tutordistro/patches/lms-env @@ -1,4 +1,3 @@ USE_EOX_TENANT: True -DEFAULT_SITE_THEME: "bragi" ENABLE_EOX_THEMING_DERIVE_WORKAROUND: True SESSION_COOKIE_DOMAIN: ".{{ LMS_HOST|common_domain(CMS_HOST) }}" diff --git a/tutordistro/patches/openedx-dockerfile-pre-assets b/tutordistro/patches/openedx-dockerfile-pre-assets index 409bfbd..8c021a6 100644 --- a/tutordistro/patches/openedx-dockerfile-pre-assets +++ b/tutordistro/patches/openedx-dockerfile-pre-assets @@ -6,7 +6,5 @@ RUN openedx-assets xmodule \ && openedx-assets common COPY --chown=app:app ./themes/ {{ DISTRO_THEMES_ROOT }} RUN openedx-assets themes \ - --theme-dirs {{ DISTRO_THEME_DIRS | join(' ') }} \ - --themes {{ DISTRO_THEMES_NAME | join(' ') }} \ && openedx-assets collect --settings=tutor.assets \ && rdfind -makesymlinks true -followsymlinks true /openedx/staticfiles/ diff --git a/tutordistro/plugin.py b/tutordistro/plugin.py index 0ad391b..898f620 100644 --- a/tutordistro/plugin.py +++ b/tutordistro/plugin.py @@ -17,43 +17,11 @@ "VERSION": __version__, "EXTRA_MIDDLEWARES": [], # DISTRO PACKAGES - "EOX_CORE_DPKG": { - "index": "git", - "name": "eox-core", - "repo": "eox-core", - "version": "v6.1.0", - "domain": "github.com", - "protocol": "https", - "path": "eduNEXT", - "variables": { - "development": { - "EOX_CORE_USERS_BACKEND": "eox_core.edxapp_wrapper" - ".backends.users_m_v1", - "EOX_CORE_ENROLLMENT_BACKEND": "eox_core.edxapp_wrapper" - ".backends.enrollment_l_v1", - "EOX_CORE_PRE_ENROLLMENT_BACKEND": "eox_core" - ".edxapp_wrapper" - ".backends" - ".pre_enrollment_l_v1", - }, - "production": { - "EOX_CORE_USERS_BACKEND": "eox_core.edxapp_wrapper" - ".backends.users_m_v1", - "EOX_CORE_ENROLLMENT_BACKEND": "eox_core.edxapp_wrapper" - ".backends.enrollment_l_v1", - "EOX_CORE_PRE_ENROLLMENT_BACKEND": "eox_core" - ".edxapp_wrapper" - ".backends" - ".pre_enrollment_l_v1", - }, - }, - "private": False, - }, "EOX_TENANT_DPKG": { "index": "git", "name": "eox-tenant", "repo": "eox-tenant", - "version": "v6.0.0", + "version": "v6.0.1", "domain": "github.com", "protocol": "https", "path": "eduNEXT", @@ -71,123 +39,18 @@ }, "private": False, }, - "EOX_THEMING_DPKG": { - "index": "git", - "name": "eox-theming", - "repo": "eox-theming", - "version": "v3.1.0", - "domain": "github.com", - "protocol": "https", - "path": "eduNEXT", - "variables": { - "development": { - "GET_BRANDING_API": "eox_tenant.edxapp_wrapper.backends" - ".branding_api_l_v1", - }, - "production": { - "GET_BRANDING_API": "eox_tenant.edxapp_wrapper.backends" - ".branding_api_l_v1", - }, - }, - "EOX_THEMING_CONFIG_SOURCES":[ - "from_eox_tenant_microsite_v2", - "from_django_settings" - ], - "private": False, - }, - "EOX_AUDIT_MODEL_DPKG": { - "index": "git", - "name": "eox-audit-model", - "repo": "eox-audit-model", - "version": "v0.7.3", - "domain": "github.com", - "protocol": "https", - "path": "eduNEXT", - "variables": { - "development": { - }, - "production": { - }, - }, - "private": False, - }, - "EOX_HOOKS_DPKG": { - "index": "git", - "name": "eox-hooks", - "repo": "eox-hooks", - "version": "v2.0.1", - "domain": "github.com", - "protocol": "https", - "path": "eduNEXT", - "variables": { - "development": { - "EOX_HOOKS_ENROLLMENTS_BACKEND": "eox_hooks.edxapp_wrapper.backends" - ".enrollments_l_v1", - "EOX_HOOKS_COURSES_BACKEND": "eox_hooks.edxapp_wrapper.backends.courses_l_v1", - "EOX_HOOKS_COURSE_MODES_BACKEND": "eox_hooks.edxapp_wrapper.backends" - ".course_modes_l_v1", - "EOX_HOOKS_MODELS_BACKEND": "eox_hooks.edxapp_wrapper.backends.models_l_v1", - }, - "production": { - "EOX_HOOKS_ENROLLMENTS_BACKEND": "eox_hooks.edxapp_wrapper.backends" - ".enrollments_l_v1", - "EOX_HOOKS_COURSES_BACKEND": "eox_hooks.edxapp_wrapper.backends.courses_l_v1", - "EOX_HOOKS_COURSE_MODES_BACKEND": "eox_hooks.edxapp_wrapper.backends" - ".course_modes_l_v1", - "EOX_HOOKS_MODELS_BACKEND": "eox_hooks.edxapp_wrapper.backends.models_l_v1", - }, - }, - "private": False, - }, - "EOX_TAGGING_DPKG": { - "index": "git", - "name": "eox-tagging", - "repo": "eox-tagging", - "version": "v4.0.0", - "domain": "github.com", - "protocol": "https", - "path": "eduNEXT", - "variables": { - "development": { - "EOX_TAGGING_GET_ENROLLMENT_OBJECT": "eox_tagging" - ".edxapp_wrappers" - ".backends.enrollment_l_v1", - }, - "production": { - "EOX_TAGGING_GET_ENROLLMENT_OBJECT": "eox_tagging" - ".edxapp_wrappers" - ".backends.enrollment_l_v1", - }, - }, - "private": False, - }, "THEMES_ROOT": "/openedx/themes", - "THEME_DIRS": [ - "/openedx/themes/ednx-saas-themes/edx-platform", - "/openedx/themes/ednx-saas-themes/edx-platform/bragi-children", - "/openedx/themes/ednx-saas-themes/edx-platform/bragi-generator", - ], - "THEMES_NAME": [ - "bragi", - ], - "THEMES": [ - { - "name": "ednx-saas-themes", - "repo": "ednx-saas-themes", - "version": "edunext/mango.master", - "domain": "github.com", - "protocol": "ssh", - "path": "eduNEXT", - }, - ], + "THEME_DIRS": [], + "THEMES_NAME": [], + "THEMES": [], "INSTALL_EDNX_REQUIREMENTS": False, }, "unique": {}, "overrides": { - "DOCKER_IMAGE_OPENEDX": "docker.io/ednxops/distro-edunext-edxapp:mango", - "DOCKER_IMAGE_OPENEDX_DEV": "docker.io/ednxops/distro-edunext-edxapp-dev:mango", + "DOCKER_IMAGE_OPENEDX": "docker.io/ednxops/distro-edunext-edxapp:nuez", + "DOCKER_IMAGE_OPENEDX_DEV": "docker.io/ednxops/distro-edunext-edxapp-dev:nuez", "EDX_PLATFORM_REPOSITORY": "https://github.com/eduNEXT/edunext-platform.git", - "EDX_PLATFORM_VERSION": "ednx-release/mango.master", + "EDX_PLATFORM_VERSION": "ednx-release/nuez.master", }, } diff --git a/tutordistro/templates/distro/tasks/lms/pre-init b/tutordistro/templates/distro/tasks/lms/pre-init index ada177f..0276806 100644 --- a/tutordistro/templates/distro/tasks/lms/pre-init +++ b/tutordistro/templates/distro/tasks/lms/pre-init @@ -1,5 +1,2 @@ -./manage.py lms migrate contenttypes ./manage.py lms migrate eox_tenant -./manage.py lms migrate eox_core -./manage.py lms migrate eox_tagging -./manage.py lms migrate eox_audit_model + From 169cbf781e6f7a66c39102b16817229f3672788f Mon Sep 17 00:00:00 2001 From: Diana Catalina Olarte Date: Tue, 30 Aug 2022 09:15:54 -0500 Subject: [PATCH 3/8] docs: update README --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a5562bb..8014d41 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ This plugin works with some docker images. These are defined by default if you have different images that aren't based on these, you can have some problems. ```yaml -DOCKER_IMAGE_OPENEDX: "docker.io/ednxops/distro-edunext-edxapp:mango" -DOCKER_IMAGE_OPENEDX_DEV: "docker.io/ednxops/distro-edunext-edxapp-dev:mango" +DOCKER_IMAGE_OPENEDX: "docker.io/ednxops/distro-edunext-edxapp:nuez" +DOCKER_IMAGE_OPENEDX_DEV: "docker.io/ednxops/distro-edunext-edxapp-dev:nuez" ``` Also, you need an edx-platform version distro compatible. @@ -40,12 +40,13 @@ Also, you need an edx-platform version distro compatible. | ------- | -------- | ----- | | lilac | limonero | v12 | | maple | mango | v13 | +| nutmeg | nuez | v14 | You can find distro releases on https://github.com/edunext/edunext-platform. ```yaml EDX_PLATFORM_REPOSITORY: "https://github.com/eduNEXT/edunext-platform.git" -EDX_PLATFORM_VERSION: "ednx-release/mango.master" +EDX_PLATFORM_VERSION: "ednx-release/nuez.master" ``` # Packages @@ -61,6 +62,8 @@ These packages will be installed in a default installation. - eox-audit-model (DISTRO_EOX_AUDIT_MODEL_DPKG) - eox-tagging (DISTRO_EOX_TAGGING_DPKG) +**NOTE**: Currently nuez only install eox-tenant by default. + ## How to add a new package In your config.yml you can set any package following this structure: @@ -137,6 +140,8 @@ These themes will be installed in a default installation. - [bragi](https://github.com/eduNEXT/ednx-saas-themes/tree/edunext/mango.master) +**NOTE**: Currently nuez doesn't have a default theme. + ## How to add a theme You can override the default themes on the config.yml but From 43dca1a050e8ec695b09691c0bce8f7f1989ff2a Mon Sep 17 00:00:00 2001 From: Diana Catalina Olarte Date: Wed, 31 Aug 2022 11:26:07 -0500 Subject: [PATCH 4/8] fix: update test version to current rc1 --- tests/test_distro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_distro.py b/tests/test_distro.py index 556db9f..1ba4298 100644 --- a/tests/test_distro.py +++ b/tests/test_distro.py @@ -9,4 +9,4 @@ def test_version(): """ Tutor distro plugin tests version """ - assert __version__ == '2.2.0' + assert __version__ == '3.0.0-rc1' From 83a00333c7addf4bd40a2285d3d599af1659c938 Mon Sep 17 00:00:00 2001 From: Diana Catalina Olarte Date: Wed, 31 Aug 2022 11:26:12 -0500 Subject: [PATCH 5/8] =?UTF-8?q?Bump=20version:=202.2.0=20=E2=86=92=203.0.0?= =?UTF-8?q?-rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.cfg | 2 +- tutordistro/__about__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index dabad90..7dd5158 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.3.0 +current_version = 3.0.0-rc1 commit = True tag = True diff --git a/tutordistro/__about__.py b/tutordistro/__about__.py index 55e4709..528787c 100644 --- a/tutordistro/__about__.py +++ b/tutordistro/__about__.py @@ -1 +1 @@ -__version__ = "2.3.0" +__version__ = "3.0.0" From e0508942f96214f750e51ab3672439125a94d90a Mon Sep 17 00:00:00 2001 From: Diana Catalina Olarte Date: Thu, 13 Oct 2022 18:17:21 -0500 Subject: [PATCH 6/8] feat: add DISTRO_DISABLE_MFE to remove learning-mfe redirection --- README.md | 10 ++++++++++ tutordistro/plugin.py | 8 +++++++- tutordistro/templates/distro/tasks/lms/init | 8 ++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 tutordistro/templates/distro/tasks/lms/init diff --git a/README.md b/README.md index 8014d41..e02e0c7 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,16 @@ DISTRO_EXTRA_MIDDLEWARES: - middleware.test.2 ``` +## How disable MFE + +You can disable MFE default redirections and use the legacy frontend in nuez release adding in config.yml: + +```yaml +DISTRO_DISABLE_MFE: true +``` + +Remember don't install tutor-mfe. + # License This software is licensed under the terms of the AGPLv3. diff --git a/tutordistro/plugin.py b/tutordistro/plugin.py index 898f620..62b41ec 100644 --- a/tutordistro/plugin.py +++ b/tutordistro/plugin.py @@ -44,6 +44,7 @@ "THEMES_NAME": [], "THEMES": [], "INSTALL_EDNX_REQUIREMENTS": False, + "DISTRO_DISABLE_MFE": False }, "unique": {}, "overrides": { @@ -56,7 +57,12 @@ ################# Initialization tasks # To run the script from templates/distro/tasks/myservice/init, add: - +hooks.Filters.COMMANDS_INIT.add_item( + ( + "lms", + ("distro", "tasks", "lms", "init"), + ) +) # Plugin templates hooks.Filters.ENV_TEMPLATE_ROOTS.add_item( diff --git a/tutordistro/templates/distro/tasks/lms/init b/tutordistro/templates/distro/tasks/lms/init new file mode 100644 index 0000000..c3c0608 --- /dev/null +++ b/tutordistro/templates/distro/tasks/lms/init @@ -0,0 +1,8 @@ +{% if DISTRO_DISABLE_MFE %} +(./manage.py lms waffle_flag --list | grep course_home.course_home_use_legacy_frontend) || ./manage.py lms waffle_flag --create --everyone course_home.course_home_use_legacy_frontend +(./manage.py lms waffle_flag --list | grep courseware.use_legacy_frontend) || ./manage.py lms waffle_flag --create --everyone courseware.use_legacy_frontend + +{% else %} +./manage.py lms waffle_delete --flags course_home.course_home_use_legacy_frontend +./manage.py lms waffle_delete --flags courseware.use_legacy_frontend +{% endif %} From 7f3c147bfc25e3d739b4d6338df64ecbaea23cd5 Mon Sep 17 00:00:00 2001 From: Diana Olarte Date: Wed, 26 Oct 2022 09:09:29 -0500 Subject: [PATCH 7/8] feat(DS-282): add eox-plugins to nuez and bragi (#33) * feat: add eox-core nutmeg compatibility * feat: add eox-theming nutmeg compatibility * feat: add eox-hooks nutmeg compatibility * feat: add eox-tagging nutmeg compatibility * feat: add eox-audit-model nutmeg compatibility * fix: revert contenttypes delete migrate * feat: add bragi nuez version * docs: update README --- README.md | 2 - tutordistro/patches/cms-env | 1 + tutordistro/patches/lms-env | 1 + .../patches/openedx-dockerfile-pre-assets | 2 + tutordistro/plugin.py | 114 +++++++++++++++++- .../templates/distro/tasks/lms/pre-init | 5 +- 6 files changed, 119 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e02e0c7..bb773d5 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,6 @@ These packages will be installed in a default installation. - eox-audit-model (DISTRO_EOX_AUDIT_MODEL_DPKG) - eox-tagging (DISTRO_EOX_TAGGING_DPKG) -**NOTE**: Currently nuez only install eox-tenant by default. ## How to add a new package @@ -140,7 +139,6 @@ These themes will be installed in a default installation. - [bragi](https://github.com/eduNEXT/ednx-saas-themes/tree/edunext/mango.master) -**NOTE**: Currently nuez doesn't have a default theme. ## How to add a theme diff --git a/tutordistro/patches/cms-env b/tutordistro/patches/cms-env index d1618af..8935924 100644 --- a/tutordistro/patches/cms-env +++ b/tutordistro/patches/cms-env @@ -1 +1,2 @@ USE_EOX_TENANT: True +DEFAULT_SITE_THEME: "bragi" diff --git a/tutordistro/patches/lms-env b/tutordistro/patches/lms-env index e90432a..5cd310c 100644 --- a/tutordistro/patches/lms-env +++ b/tutordistro/patches/lms-env @@ -1,3 +1,4 @@ USE_EOX_TENANT: True +DEFAULT_SITE_THEME: "bragi" ENABLE_EOX_THEMING_DERIVE_WORKAROUND: True SESSION_COOKIE_DOMAIN: ".{{ LMS_HOST|common_domain(CMS_HOST) }}" diff --git a/tutordistro/patches/openedx-dockerfile-pre-assets b/tutordistro/patches/openedx-dockerfile-pre-assets index 8c021a6..409bfbd 100644 --- a/tutordistro/patches/openedx-dockerfile-pre-assets +++ b/tutordistro/patches/openedx-dockerfile-pre-assets @@ -6,5 +6,7 @@ RUN openedx-assets xmodule \ && openedx-assets common COPY --chown=app:app ./themes/ {{ DISTRO_THEMES_ROOT }} RUN openedx-assets themes \ + --theme-dirs {{ DISTRO_THEME_DIRS | join(' ') }} \ + --themes {{ DISTRO_THEMES_NAME | join(' ') }} \ && openedx-assets collect --settings=tutor.assets \ && rdfind -makesymlinks true -followsymlinks true /openedx/staticfiles/ diff --git a/tutordistro/plugin.py b/tutordistro/plugin.py index 62b41ec..bcb858d 100644 --- a/tutordistro/plugin.py +++ b/tutordistro/plugin.py @@ -17,6 +17,38 @@ "VERSION": __version__, "EXTRA_MIDDLEWARES": [], # DISTRO PACKAGES + "EOX_CORE_DPKG": { + "index": "git", + "name": "eox-core", + "repo": "eox-core", + "version": "v7.0.0", + "domain": "github.com", + "protocol": "https", + "path": "eduNEXT", + "variables": { + "development": { + "EOX_CORE_USERS_BACKEND": "eox_core.edxapp_wrapper" + ".backends.users_m_v1", + "EOX_CORE_ENROLLMENT_BACKEND": "eox_core.edxapp_wrapper" + ".backends.enrollment_l_v1", + "EOX_CORE_PRE_ENROLLMENT_BACKEND": "eox_core" + ".edxapp_wrapper" + ".backends" + ".pre_enrollment_l_v1", + }, + "production": { + "EOX_CORE_USERS_BACKEND": "eox_core.edxapp_wrapper" + ".backends.users_m_v1", + "EOX_CORE_ENROLLMENT_BACKEND": "eox_core.edxapp_wrapper" + ".backends.enrollment_l_v1", + "EOX_CORE_PRE_ENROLLMENT_BACKEND": "eox_core" + ".edxapp_wrapper" + ".backends" + ".pre_enrollment_l_v1", + }, + }, + "private": False, + }, "EOX_TENANT_DPKG": { "index": "git", "name": "eox-tenant", @@ -39,10 +71,86 @@ }, "private": False, }, + "EOX_THEMING_DPKG": { + "index": "git", + "name": "eox-theming", + "repo": "eox-theming", + "version": "v4.0.1", + "domain": "github.com", + "protocol": "https", + "path": "eduNEXT", + "variables": { + "development": {}, + "production": {}, + }, + "EOX_THEMING_CONFIG_SOURCES":[ + "from_eox_tenant_microsite_v2", + "from_django_settings" + ], + "private": False, + }, + "EOX_HOOKS_DPKG": { + "index": "git", + "name": "eox-hooks", + "repo": "eox-hooks", + "version": "v3.0.0", + "domain": "github.com", + "protocol": "https", + "path": "eduNEXT", + "variables": { + "development": {}, + "production": {}, + }, + "private": False, + }, + "EOX_TAGGING_DPKG": { + "index": "git", + "name": "eox-tagging", + "repo": "eox-tagging", + "version": "v5.0.0", + "domain": "github.com", + "protocol": "https", + "path": "eduNEXT", + "variables": { + "development": {}, + "production": {}, + }, + "private": False, + }, + "EOX_AUDIT_MODEL_DPKG": { + "index": "git", + "name": "eox-audit-model", + "repo": "eox-audit-model", + "version": "v1.0.0", + "domain": "github.com", + "protocol": "https", + "path": "eduNEXT", + "variables": { + "development": { + }, + "production": { + }, + }, + "private": False, + }, "THEMES_ROOT": "/openedx/themes", - "THEME_DIRS": [], - "THEMES_NAME": [], - "THEMES": [], + "THEME_DIRS": [ + "/openedx/themes/ednx-saas-themes/edx-platform", + "/openedx/themes/ednx-saas-themes/edx-platform/bragi-generator", + ], + "THEMES_NAME": [ + "bragi", + ], + "THEMES": [ + { + "name": "ednx-saas-themes", + "repo": "ednx-saas-themes", + "version": "edunext/nuez.master", + "domain": "github.com", + "protocol": "ssh", + "path": "eduNEXT", + }, + ], "INSTALL_EDNX_REQUIREMENTS": False, "DISTRO_DISABLE_MFE": False }, diff --git a/tutordistro/templates/distro/tasks/lms/pre-init b/tutordistro/templates/distro/tasks/lms/pre-init index 0276806..802f1a1 100644 --- a/tutordistro/templates/distro/tasks/lms/pre-init +++ b/tutordistro/templates/distro/tasks/lms/pre-init @@ -1,2 +1,5 @@ +./manage.py lms migrate contenttypes +./manage.py lms migrate eox_core ./manage.py lms migrate eox_tenant - +./manage.py lms migrate eox_tagging +./manage.py lms migrate eox_audit_model From f6d657567d36a622c02e19a9aba9dce53bb40029 Mon Sep 17 00:00:00 2001 From: Diana Catalina Olarte Date: Wed, 26 Oct 2022 10:29:43 -0500 Subject: [PATCH 8/8] fix: typo default disable mfe flag --- tutordistro/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutordistro/plugin.py b/tutordistro/plugin.py index bcb858d..22d560a 100644 --- a/tutordistro/plugin.py +++ b/tutordistro/plugin.py @@ -152,7 +152,7 @@ }, ], "INSTALL_EDNX_REQUIREMENTS": False, - "DISTRO_DISABLE_MFE": False + "DISABLE_MFE": False }, "unique": {}, "overrides": {