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

Commit dd73dcb6 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/popup-fix-error' into 'main'

fix error

See merge request !132
parents fe05de04 d6bd5343
Loading
Loading
Loading
Loading
Loading
+1 −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,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
+30 −21
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 @@
--- 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 {
-					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();
@@ -16,11 +21,15 @@
+				   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'}
+				   );
+			   }
 			} 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 {