github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-12 14:13:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove forum. prefix from permissions

Browse Source 
closes #425
This commit is contained in:
Toby Zerner 2015-10-14 16:11:00 +10:30
parent c557bcde28
commit ba97ad561e
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/js/admin/src/components/PermissionGrid.js
View File

@ -84,10 +84,10 @@ export default class PermissionGrid extends Component {
viewItems() {
const items = new ItemList();
items.add('view', {
items.add('viewDiscussions', {
icon: 'eye',
label: app.trans('core.admin.permissions_view_discussions_label'),
permission: 'forum.view',
permission: 'viewDiscussions',
allowGuest: true
}, 100);
@ -112,7 +112,7 @@ export default class PermissionGrid extends Component {
items.add('start', {
icon: 'edit',
label: app.trans('core.admin.permissions_start_discussions_label'),
permission: 'forum.startDiscussion'
permission: 'startDiscussion'
}, 100);
items.add('allowRenaming', {

1
framework/core/src/Api/Serializer/ForumSerializer.php
View File

@ -76,7 +76,6 @@ class ForumSerializer extends AbstractSerializer
'allowSignUp' => (bool) $this->settings->get('allow_sign_up'),
'defaultRoute' => $this->settings->get('default_route'),
'canViewDiscussions' => $gate->allows('viewDiscussions'),
'canViewUserList' => $gate->allows('viewUserList'),
'canStartDiscussion' => $gate->allows('startDiscussion')
];

4
framework/core/src/Install/Console/InstallCommand.php
View File

@ -274,10 +274,10 @@ class InstallCommand extends AbstractCommand
{
$permissions = [
// Guests can view the forum
[2, 'forum.view'],
[2, 'viewDiscussions'],
// Members can create and reply to discussions
[3, 'forum.startDiscussion'],
[3, 'startDiscussion'],
[3, 'discussion.reply'],
// Moderators can edit + delete stuff