From e2c01da2facb3e9a4c004ff11c082d172de471d2 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 18 Oct 2022 13:34:52 +0530 Subject: [PATCH 1/2] fix error --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dcc58576..be366732 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,9,1/23,0,9,14/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,15/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images @@ -135,7 +135,6 @@ RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016 RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch -RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param -- GitLab From ccd80cdda2602671fc0bf9915730e0e181c41158 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 18 Oct 2022 14:13:39 +0530 Subject: [PATCH 2/2] fix patch --- Dockerfile | 1 + patches/021-repeated-storage-dialog-fix.patch | 51 +++++++++++-------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index be366732..9f614454 100644 --- a/Dockerfile +++ b/Dockerfile @@ -135,6 +135,7 @@ RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016 RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch +RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch RUN rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param diff --git a/patches/021-repeated-storage-dialog-fix.patch b/patches/021-repeated-storage-dialog-fix.patch index c5d45b17..5efa2a85 100644 --- a/patches/021-repeated-storage-dialog-fix.patch +++ b/patches/021-repeated-storage-dialog-fix.patch @@ -1,30 +1,39 @@ ---- ./apps/files/js/files.js 2022-09-23 11:28:21.551766200 +0530 -+++ ./apps/files/js/files-new.js 2022-09-26 11:55:35.003857700 +0530 -@@ -180,6 +180,19 @@ +--- apps/files/js/files.js 2022-10-18 14:02:43.814388800 +0530 ++++ apps/files/js/files-new.js 2022-10-18 14:04:54.504388800 +0530 +@@ -181,11 +181,23 @@ {type : 'error'} ); } else { -+ var exist=0; -+ $('body').find('.toastify').each(function(i, obj) { -+ var toastmsg=$(obj).text(); -+ toastmsg=toastmsg.replace('✖', '').trim(); -+ actualmsg=t('files','Your storage is full, files cannot be updated or synced anymore!'); -+ if(toastmsg===actualmsg){ -+ exist=1; -+ } -+ }); -+ if(exist==1){ -+ return; -+ } -+ var exist=0 \n\t\t$('body').find('.toastify').each(function(i, obj) { \n\t\t\tvar toastmsg=$(obj).text()\n\t\t\ttoastmsg=toastmsg.replace('✖', '').trim()\n\t\t\tactualmsg=t('files','Your storage is full, files cannot be updated or synced anymore!')\n\t\t\tif(toastmsg===actualmsg){\n\t\t\t\texist=1\n\t\t\t}\n\t\t})\n\t\tif(exist==1){\n\t\t\treturn;\n\t\t}\n\t\t - OC.Notification.show(t('files', - 'Your storage is full, files cannot be updated or synced anymore!'), - {type: 'error'} -@@ -209,6 +222,19 @@ +- OC.Notification.show(t('files', +- 'Your storage is full, files cannot be updated or synced anymore!'), +- {type: 'error'} +- ); +- } ++ var exist=0; ++ $('body').find('.toastify').each(function(i, obj) { ++ var toastmsg=$(obj).text(); ++ toastmsg=toastmsg.replace('✖', '').trim(); ++ actualmsg=t('files','Your storage is full, files cannot be updated or synced anymore!'); ++ if(toastmsg===actualmsg){ ++ exist=1; ++ } ++ }); ++ if(exist==1){ ++ return; ++ } ++ OC.Notification.show(t('files', ++ 'Your storage is full, files cannot be updated or synced anymore!'), ++ {type: 'error'} ++ ); ++ } + } else if (usedSpacePercent > 90) { + if (owner !== OC.getCurrentUser().uid) { + OC.Notification.show(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%).', +@@ -210,6 +222,19 @@ {type : 'error'} ); } else { -+ var exist=0; ++ var exist=0; + $('body').find('.toastify').each(function(i, obj) { + var toastmsg=$(obj).text(); + toastmsg=toastmsg.replace('✖', '').trim(); -- GitLab