From 933a13442fb3b83dc238c5204332908bc8b72022 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 10 Feb 2024 01:51:22 +0530 Subject: [PATCH 1/3] Add user email to storage request --- contentcuration/contentcuration/views/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contentcuration/contentcuration/views/settings.py b/contentcuration/contentcuration/views/settings.py index a186665dec..b34f311ece 100644 --- a/contentcuration/contentcuration/views/settings.py +++ b/contentcuration/contentcuration/views/settings.py @@ -182,8 +182,9 @@ def form_valid(self, form): "channels": channels, }, ) + send_mail( - "Kolibri Studio storage request", + f"Kolibri Studio storage request from {self.request.user}", message, ccsettings.DEFAULT_FROM_EMAIL, [ccsettings.SPACE_REQUEST_EMAIL, self.request.user.email], From c6d08bc71890a67d27ee225bb2e60d4b8e23f45d Mon Sep 17 00:00:00 2001 From: Abhishek Chaudhary Date: Mon, 11 Mar 2024 00:55:25 +0530 Subject: [PATCH 2/3] Add defaultWidth prop to ResizableNavigationDrawer --- .../frontend/channelEdit/components/edit/EditModal.vue | 1 + .../shared/views/ResizableNavigationDrawer.vue | 5 ++++- requirements-dev.txt | 10 +++------- requirements.in | 2 +- requirements.txt | 3 +-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue index 995072d190..d376adeb7f 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue @@ -50,6 +50,7 @@ app style="height: calc(100% - 64px);" :minWidth="150" + :defaultWidth="250" :maxWidth="500" @scroll="scroll" > diff --git a/contentcuration/contentcuration/frontend/shared/views/ResizableNavigationDrawer.vue b/contentcuration/contentcuration/frontend/shared/views/ResizableNavigationDrawer.vue index a0c817f2dd..035fcdae3a 100644 --- a/contentcuration/contentcuration/frontend/shared/views/ResizableNavigationDrawer.vue +++ b/contentcuration/contentcuration/frontend/shared/views/ResizableNavigationDrawer.vue @@ -37,6 +37,9 @@ type: Number, default: 100, }, + defaultWidth: { + type: Number, + }, maxWidth: { type: Number, default: window.innerWidth - 100, @@ -68,7 +71,7 @@ const localStorageName = this.localName + '-drawer-width'; return { dragging: false, - width: parseFloat(localStorage[localStorageName]) || this.minWidth, + width: parseFloat(localStorage[localStorageName]) || this.defaultWidth || this.minWidth, localStorageName, }; }, diff --git a/requirements-dev.txt b/requirements-dev.txt index 1b0cc9b53b..f4cdc06a18 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -53,7 +53,7 @@ customizable-django-profiler @ git+https://github.com/someshchaturvedi/customiza # via -r requirements-dev.in distlib==0.3.1 # via virtualenv -django==3.2.23 +django==3.2.24 # via # -c requirements.txt # django-debug-toolbar @@ -107,9 +107,7 @@ idna==2.10 # -c requirements.txt # requests importlib-metadata==1.7.0 - # via - # -c requirements.txt - # pre-commit + # via pre-commit inflection==0.5.1 # via drf-yasg iniconfig==1.1.1 @@ -280,9 +278,7 @@ wheel==0.38.1 whitenoise==5.2.0 # via -r requirements-dev.in zipp==3.4.1 - # via - # -c requirements.txt - # importlib-metadata + # via importlib-metadata zope-event==4.5.0 # via gevent zope-interface==5.4.0 diff --git a/requirements.in b/requirements.in index 7e92d7898a..bfce094b72 100644 --- a/requirements.in +++ b/requirements.in @@ -13,7 +13,7 @@ newrelic>=2.86.3.70 celery==5.2.7 redis python-postmark==0.5.8 -Django==3.2.23 +Django==3.2.24 django-webpack-loader==0.7.0 google-cloud-error-reporting google-cloud-storage diff --git a/requirements.txt b/requirements.txt index 6fe9597c8c..57d2ed95e9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,10 +50,9 @@ click-repl==0.2.0 # via celery confusable-homoglyphs==3.2.0 # via django-registration -django==3.2.23 +django==3.2.24 # via # -r requirements.in - # django-bulk-update # django-db-readonly # django-filter # django-js-reverse From eeaf83841cbb6aeb78d18cafbbe6e9539d92c05c Mon Sep 17 00:00:00 2001 From: Abhishek Chaudhary Date: Wed, 13 Mar 2024 00:08:50 +0530 Subject: [PATCH 3/3] Fix lint issue in ResizableNavigationDrawer --- .../frontend/shared/views/ResizableNavigationDrawer.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/contentcuration/contentcuration/frontend/shared/views/ResizableNavigationDrawer.vue b/contentcuration/contentcuration/frontend/shared/views/ResizableNavigationDrawer.vue index 035fcdae3a..28801fefda 100644 --- a/contentcuration/contentcuration/frontend/shared/views/ResizableNavigationDrawer.vue +++ b/contentcuration/contentcuration/frontend/shared/views/ResizableNavigationDrawer.vue @@ -39,6 +39,7 @@ }, defaultWidth: { type: Number, + default: 150, }, maxWidth: { type: Number,