mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 23:17:43 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
Assorted 1.0 QA fixes
This commit is contained in:
Alexander Skvortsov
2021-05-15 19:07:41 -04:00
committed by GitHub
parent dd3c203827 fede3f9fc7
commit 9b76c8f611
7 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/admin/components/EditCustomCssModal.js
View File

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

2
js/src/admin/components/EditCustomFooterModal.js
View File

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

2
js/src/admin/components/EditCustomHeaderModal.js
View File

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

34
js/src/forum/components/NotificationList.js
View File

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

4
js/src/forum/utils/KeyboardNavigatable.ts
View File

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

2
less/admin/AppearancePage.less
View File

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

1
src/User/Command/EditUserHandler.php
View File

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