mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 07:27:39 +02:00
Code Issues Releases Wiki Activity

Generalise the potential for unapproved state to all posts, rather than just comments

Browse Source 
This is just more future-proofing, in case any other extensions introduce new post types which can be queued for approval.
This commit is contained in:
Toby Zerner
2016-05-28 09:48:17 +09:30
parent 9f4e11097d
commit 0bd3c16084
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/approval/js/forum/dist/extension.js vendored
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
System.register('flarum/approval/main', ['flarum/extend', 'flarum/app', 'flarum/models/Discussion', 'flarum/models/Post', 'flarum/components/Badge', 'flarum/components/DiscussionListItem', 'flarum/components/CommentPost', 'flarum/components/Button', 'flarum/utils/PostControls'], function (_export, _context) { System.register('flarum/approval/main', ['flarum/extend', 'flarum/app', 'flarum/models/Discussion', 'flarum/models/Post', 'flarum/components/Badge', 'flarum/components/DiscussionListItem', 'flarum/components/Post', 'flarum/components/CommentPost', 'flarum/components/Button', 'flarum/utils/PostControls'], function (_export, _context) {
var extend, override, app, Discussion, Post, Badge, DiscussionListItem, CommentPost, Button, PostControls; var extend, override, app, Discussion, Post, Badge, DiscussionListItem, PostComponent, CommentPost, Button, PostControls;
return { return {
setters: [function (_flarumExtend) { setters: [function (_flarumExtend) {
extend = _flarumExtend.extend; extend = _flarumExtend.extend;
@@ -16,6 +16,8 @@ System.register('flarum/approval/main', ['flarum/extend', 'flarum/app', 'flarum/
Badge = _flarumComponentsBadge.default; Badge = _flarumComponentsBadge.default;
}, function (_flarumComponentsDiscussionListItem) { }, function (_flarumComponentsDiscussionListItem) {
DiscussionListItem = _flarumComponentsDiscussionListItem.default; DiscussionListItem = _flarumComponentsDiscussionListItem.default;
}, function (_flarumComponentsPost) {
PostComponent = _flarumComponentsPost.default;
}, function (_flarumComponentsCommentPost) { }, function (_flarumComponentsCommentPost) {
CommentPost = _flarumComponentsCommentPost.default; CommentPost = _flarumComponentsCommentPost.default;
}, function (_flarumComponentsButton) { }, function (_flarumComponentsButton) {
@@ -44,9 +46,9 @@ System.register('flarum/approval/main', ['flarum/extend', 'flarum/app', 'flarum/
} }
}); });
extend(CommentPost.prototype, 'attrs', function (attrs) { extend(PostComponent.prototype, 'attrs', function (attrs) {
if (!this.props.post.isApproved() && !this.props.post.isHidden()) { if (!this.props.post.isApproved()) {
attrs.className += ' CommentPost--unapproved'; attrs.className += ' Post--unapproved';
} }
}); });
@@ -56,7 +58,7 @@ System.register('flarum/approval/main', ['flarum/extend', 'flarum/app', 'flarum/
} }
}); });
override(CommentPost.prototype, 'flagReason', function (original, flag) { override(PostComponent.prototype, 'flagReason', function (original, flag) {
if (flag.type() === 'approval') { if (flag.type() === 'approval') {
return app.translator.trans('flarum-approval.forum.post.awaiting_approval_text'); return app.translator.trans('flarum-approval.forum.post.awaiting_approval_text');
} }

9
extensions/approval/js/forum/src/main.js
View File

@@ -4,6 +4,7 @@ import Discussion from 'flarum/models/Discussion';
import Post from 'flarum/models/Post'; import Post from 'flarum/models/Post';
import Badge from 'flarum/components/Badge'; import Badge from 'flarum/components/Badge';
import DiscussionListItem from 'flarum/components/DiscussionListItem'; import DiscussionListItem from 'flarum/components/DiscussionListItem';
import PostComponent from 'flarum/components/Post';
import CommentPost from 'flarum/components/CommentPost'; import CommentPost from 'flarum/components/CommentPost';
import Button from 'flarum/components/Button'; import Button from 'flarum/components/Button';
import PostControls from 'flarum/utils/PostControls'; import PostControls from 'flarum/utils/PostControls';
@@ -27,9 +28,9 @@ app.initializers.add('flarum-approval', () => {
} }
}); });
extend(CommentPost.prototype, 'attrs', function(attrs) { extend(PostComponent.prototype, 'attrs', function(attrs) {
if (!this.props.post.isApproved() && !this.props.post.isHidden()) { if (!this.props.post.isApproved()) {
attrs.className += ' CommentPost--unapproved'; attrs.className += ' Post--unapproved';
} }
}); });
@@ -39,7 +40,7 @@ app.initializers.add('flarum-approval', () => {
} }
}); });
override(CommentPost.prototype, 'flagReason', function(original, flag) { override(PostComponent.prototype, 'flagReason', function(original, flag) {
if (flag.type() === 'approval') { if (flag.type() === 'approval') {
return app.translator.trans('flarum-approval.forum.post.awaiting_approval_text'); return app.translator.trans('flarum-approval.forum.post.awaiting_approval_text');
} }

5
extensions/approval/less/forum/extension.less
View File

@@ -1,7 +1,8 @@
.CommentPost--unapproved { .Post--unapproved {
.Post-header, .Post-header,
.Post-body, .Post-body,
.Post-footer { .EventPost-icon,
.EventPost-info {
opacity: 0.5; opacity: 0.5;
} }
} }