]> cat aescling's git repositories - mastodon.git/commitdiff
[Glitch] Fix list not being automatically unpinned when it returns 404 in web UI
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 11 Jun 2019 00:26:37 +0000 (02:26 +0200)
committerThibaut Girka <thib@sitedethib.com>
Tue, 11 Jun 2019 19:57:32 +0000 (21:57 +0200)
Port 92b572e2a3830086497900fa78dcfcc2ae919e33 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
app/javascript/flavours/glitch/actions/alerts.js
app/javascript/flavours/glitch/styles/components/columns.scss

index b2c7ab76aad66434765804dd3f7ccffc1b4e6707..ef2500e7bdd84fb6a3cd353991a07ae1371f5bd7 100644 (file)
@@ -8,6 +8,7 @@ const messages = defineMessages({
 export const ALERT_SHOW    = 'ALERT_SHOW';
 export const ALERT_DISMISS = 'ALERT_DISMISS';
 export const ALERT_CLEAR   = 'ALERT_CLEAR';
+export const ALERT_NOOP    = 'ALERT_NOOP';
 
 export function dismissAlert(alert) {
   return {
@@ -36,7 +37,7 @@ export function showAlertForError(error) {
 
     if (status === 404 || status === 410) {
       // Skip these errors as they are reflected in the UI
-      return {};
+      return { type: ALERT_NOOP };
     }
 
     let message = statusText;
index 7a8accc27a8dc26da8ee64b5fe230a91aaecb81b..0bf01ed8db8e9ff3c363c6b358290f515fb206cf 100644 (file)
   margin-left: 0;
 }
 
+.column-header__links {
+  margin-bottom: 14px;
+}
+
 .column-header__links .text-btn {
   margin-right: 10px;
 }