github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-02 04:45:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Permission Name (#965)

Browse Source
This commit is contained in:
Davis 2016-05-26 09:54:25 -05:00 committed by Franz Liedke
parent 7d448e81ff
commit 6061f404f9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,10 +173,10 @@ export default class PermissionGrid extends Component {
moderateItems() { moderateItems() {
const items = new ItemList(); const items = new ItemList();
items.add('viewPostIps', { items.add('viewIpsPosts', {
icon: 'bullseye', icon: 'bullseye',
label: app.translator.trans('core.admin.permissions.view_post_ips_label'), label: app.translator.trans('core.admin.permissions.view_post_ips_label'),
permission: 'discussion.viewPostIps' permission: 'discussion.viewIpsPosts'
}, 110); }, 110);
items.add('renameDiscussions', { items.add('renameDiscussions', {

2
framework/core/src/Api/Serializer/PostSerializer.php
View File

@ -47,7 +47,7 @@ class PostSerializer extends PostBasicSerializer
if ($canEdit) { if ($canEdit) {
$attributes['content'] = $post->content; $attributes['content'] = $post->content;
} }
if ($gate->allows('viewPostIps', $post)) { if ($gate->allows('viewIps', $post)) {
$attributes['ipAddress'] = $post->ip_address; $attributes['ipAddress'] = $post->ip_address;
} }
} else { } else {