mirror of
https://github.com/flarum/framework.git
synced 2025-02-15 09:32:51 +08:00
fix: js errors
This commit is contained in:
parent
94991862ed
commit
e5389acd6e
|
@ -1,8 +1,18 @@
|
||||||
import Extend from 'flarum/common/extenders';
|
import Extend from 'flarum/common/extenders';
|
||||||
import commonExtend from '../common/extend';
|
import commonExtend from '../common/extend';
|
||||||
|
import app from '@flarum/core/dist-typings/admin/app';
|
||||||
|
|
||||||
export default [
|
export default [
|
||||||
...commonExtend,
|
...commonExtend,
|
||||||
|
|
||||||
// Add your admin extenders here
|
new Extend.Admin().permission(
|
||||||
|
() => ({
|
||||||
|
icon: 'fas fa-envelope-open-text',
|
||||||
|
label: app.translator.trans('flarum-messages.admin.permissions.send_messages'),
|
||||||
|
permission: 'dialog.sendMessage',
|
||||||
|
allowGuest: false,
|
||||||
|
}),
|
||||||
|
'start',
|
||||||
|
98
|
||||||
|
),
|
||||||
];
|
];
|
||||||
|
|
|
@ -3,14 +3,5 @@ import app from 'flarum/admin/app';
|
||||||
export { default as extend } from './extend';
|
export { default as extend } from './extend';
|
||||||
|
|
||||||
app.initializers.add('flarum-messages', () => {
|
app.initializers.add('flarum-messages', () => {
|
||||||
app.extensionData.for('flarum-messages').registerPermission(
|
//
|
||||||
{
|
|
||||||
icon: 'fas fa-envelope-open-text',
|
|
||||||
label: app.translator.trans('flarum-messages.admin.permissions.send_messages'),
|
|
||||||
permission: 'dialog.sendMessage',
|
|
||||||
allowGuest: false,
|
|
||||||
},
|
|
||||||
'start',
|
|
||||||
98
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -161,8 +161,8 @@ export default class MessageStream<CustomAttrs extends IDialogStreamAttrs = IDia
|
||||||
if (lastTime && dt > 1000 * 60 * 60 * 24 * 4) {
|
if (lastTime && dt > 1000 * 60 * 60 * 24 * 4) {
|
||||||
return (
|
return (
|
||||||
<div className="PostStream-timeGap">
|
<div className="PostStream-timeGap">
|
||||||
{/* @ts-ignore */}
|
|
||||||
<span>
|
<span>
|
||||||
|
{/* @ts-ignore */}
|
||||||
{app.translator.trans('flarum-messages.forum.messages_page.stream.time_lapsed_text', { period: dayjs().add(dt, 'ms').fromNow(true) })}
|
{app.translator.trans('flarum-messages.forum.messages_page.stream.time_lapsed_text', { period: dayjs().add(dt, 'ms').fromNow(true) })}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -58,7 +58,7 @@ export default function () {
|
||||||
if (
|
if (
|
||||||
item.permission === 'viewForum' ||
|
item.permission === 'viewForum' ||
|
||||||
item.permission === 'startDiscussion' ||
|
item.permission === 'startDiscussion' ||
|
||||||
(item.permission.startsWith('discussion.') && item.tagScoped !== false) ||
|
(item.permission?.startsWith('discussion.') && item.tagScoped !== false) ||
|
||||||
item.tagScoped
|
item.tagScoped
|
||||||
) {
|
) {
|
||||||
return <PermissionDropdown permission={`tag${tag.id()}.${item.permission}`} allowGuest={item.allowGuest} />;
|
return <PermissionDropdown permission={`tag${tag.id()}.${item.permission}`} allowGuest={item.allowGuest} />;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user