Просмотр исходного кода

Merge pull request #1912 from overleaf/ta-invite-404

Better Handling of Invites not Found

GitOrigin-RevId: 6fddd1dca772bb4b5108fef433044720fb78c4e9
Timothée Alby 7 лет назад
Родитель
Сommit
c86910a5ef
1 измененных файлов с 12 добавлено и 5 удалено
  1. 12 5
      services/web/public/src/main/project-list/notifications-controller.js

+ 12 - 5
services/web/public/src/main/project-list/notifications-controller.js

@@ -47,13 +47,20 @@ define(['base'], function(App) {
           'X-Requested-With': 'XMLHttpRequest'
           'X-Requested-With': 'XMLHttpRequest'
         }
         }
       })
       })
-        .then(function() {
-          $scope.notification.inflight = false
-          return ($scope.notification.accepted = true)
+        .then(() => {
+          $scope.notification.accepted = true
+        })
+        .catch(({ status }) => {
+          if (status === 404) {
+            // 404 probably means the invite has already been accepted and
+            // deleted. Treat as success
+            $scope.notification.accepted = true
+          } else {
+            $scope.notification.error = true
+          }
         })
         })
-        .catch(function() {
+        .finally(() => {
           $scope.notification.inflight = false
           $scope.notification.inflight = false
-          return ($scope.notification.error = true)
         })
         })
     })
     })
   })
   })