Merge pull request #2867 from flarum/as/1.0-qa-fixes

Assorted 1.0 QA fixes

js/src/admin/components/EditCustomCssModal.js

@@ -2,7 +2,7 @@ import SettingsModal from './SettingsModal';
 
 export default class EditCustomCssModal extends SettingsModal {
   className() {
-    return 'EditCustomCssModal Modal--large';
+    return 'EditCustomCssModal TextareaCodeModal Modal--large';
   }
 
   title() {

js/src/admin/components/EditCustomFooterModal.js

@@ -2,7 +2,7 @@ import SettingsModal from './SettingsModal';
 
 export default class EditCustomFooterModal extends SettingsModal {
   className() {
-    return 'EditCustomFooterModal Modal--large';
+    return 'EditCustomFooterModal TextareaCodeModal Modal--large';
   }
 
   title() {

js/src/admin/components/EditCustomHeaderModal.js

@@ -2,7 +2,7 @@ import SettingsModal from './SettingsModal';
 
 export default class EditCustomHeaderModal extends SettingsModal {
   className() {
-    return 'EditCustomHeaderModal Modal--large';
+    return 'EditCustomHeaderModal TextareaCodeModal Modal--large';
   }
 
   title() {

js/src/forum/components/NotificationList.js

@@ -12,7 +12,6 @@ import Discussion from '../../common/models/Discussion';
 export default class NotificationList extends Component {
   view() {
     const state = this.attrs.state;
-    const pages = state.getPages();
 
     return (
       <div className="NotificationList">
@@ -29,9 +28,18 @@ export default class NotificationList extends Component {
           </div>
         </div>
 
-        <div className="NotificationList-content">
-          {state.hasItems()
-            ? pages.map((page) => {
+        <div className="NotificationList-content">{this.content(state)}</div>
+      </div>
+    );
+  }
+
+  content(state) {
+    if (state.isLoading()) {
+      return <LoadingIndicator className="LoadingIndicator--block" />;
+    }
+
+    if (state.hasItems()) {
+      return state.getPages().map((page) => {
         const groups = [];
         const discussions = {};
 
@@ -65,7 +73,7 @@ export default class NotificationList extends Component {
             <div className="NotificationGroup">
               {group.discussion ? (
                 <Link className="NotificationGroup-header" href={app.route.discussion(group.discussion)}>
-                          {badges && badges.length && <ul className="NotificationGroup-badges badges">{listItems(badges)}</ul>}
+                  {badges && !!badges.length && <ul className="NotificationGroup-badges badges">{listItems(badges)}</ul>}
                   <span>{group.discussion.title()}</span>
                 </Link>
               ) : (
@@ -81,18 +89,10 @@ export default class NotificationList extends Component {
             </div>
           );
         });
-              })
-            : ''}
-          {state.isLoading() ? (
-            <LoadingIndicator className="LoadingIndicator--block" />
-          ) : pages.length ? (
-            ''
-          ) : (
-            <div className="NotificationList-empty">{app.translator.trans('core.forum.notifications.empty_text')}</div>
-          )}
-        </div>
-      </div>
-    );
+      });
+    }
+
+    return <div className="NotificationList-empty">{app.translator.trans('core.forum.notifications.empty_text')}</div>;
   }
 
   oncreate(vnode) {

js/src/forum/utils/KeyboardNavigatable.ts

@@ -104,7 +104,9 @@ export default class KeyboardNavigatable {
    * Provide a callback that determines whether keyboard input should be handled.
    */
   when(callback: ShouldHandle): KeyboardNavigatable {
-    return { ...this, whenCallback: callback };
+    this.whenCallback = callback;
+
+    return this;
   }
 
   /**

less/admin/AppearancePage.less

@@ -37,7 +37,7 @@
   margin-bottom: 15px;
 }
 
-.EditCustomCssModal, .EditCustomHeaderModal {
+.TextareaCodeModal {
   textarea {
     font-family: monospace;
     line-height: 1;

src/User/Command/EditUserHandler.php

@@ -130,6 +130,7 @@ class EditUserHandler
 
             $user->afterSave(function (User $user) use ($newGroupIds) {
                 $user->groups()->sync($newGroupIds);
+                $user->unsetRelation('groups');
             });
         }