Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31c0c41d authored by AVINASH GUSAIN's avatar AVINASH GUSAIN Committed by Arnau Vàzquez
Browse files

Prevent repeated dialog messages on murena.io

parent 1fba3b0b
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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,12/' ${BASE_DIR}/version.php
RUN sed -i 's/23,0,9,1/23,0,9,14/' ${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,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
+42 −0
Original line number Diff line number Diff line
--- ./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 @@
 						{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 @@
 						{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 almost full ({usedSpacePercent}%).',
+						{usedSpacePercent: usedSpacePercent});
+						if(toastmsg===actualmsg){
+							exist=1;
+						}
+					});
+					if(exist==1){
+						return;
+					}
 					OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%).',
 						{usedSpacePercent: usedSpacePercent}),
 						{type : 'error'}