Skip to content

Commit

Permalink
Merge branch 'master' into enhance/refacotr-ui-x-menu
Browse files Browse the repository at this point in the history
  • Loading branch information
xyhp915 committed Jan 8, 2024
2 parents 990818d + ab37d30 commit ab94100
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions src/main/frontend/fs/sync.cljs
Expand Up @@ -3364,18 +3364,19 @@
ok? (and (= 200 (:status r1*))
(= 200 (:status r2*))
(= "OK" (:body r2*)))]
(if ok?
(notification/clear! :sync-connection-failed)
(notification/show! [:div
(t :file-sync/connectivity-testing-failed)
[:a {:href api-url} api-url]
" and "
[:a
{:href config/CONNECTIVITY-TESTING-S3-URL}
config/CONNECTIVITY-TESTING-S3-URL]]
:warning
false
:sync-connection-failed))
(when (user/logged-in?)
(if ok?
(notification/clear! :sync-connection-failed)
(notification/show! [:div
(t :file-sync/connectivity-testing-failed)
[:a {:href api-url} api-url]
" and "
[:a
{:href config/CONNECTIVITY-TESTING-S3-URL}
config/CONNECTIVITY-TESTING-S3-URL]]
:warning
false
:sync-connection-failed)))
ok?)))

(declare network-online-cursor)
Expand Down

0 comments on commit ab94100

Please sign in to comment.