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

Make discussion "hidden" state more explicit

Browse Source 
Previously a discussion was classified on the front-end as "hidden" if it had zero posts. This was technically a correct statement as the discussion would not be visible to the public... but it also meant that a discussion with zero posts (like one awaiting approval) was impossible for the OP to delete/hide (i.e. indicate that they made a mistake and they don't want the discussion to be approved).
This commit is contained in:
Toby Zerner 2016-05-28 09:43:21 +09:30
parent a380424de4
commit 2d5a7ce064
4 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/admin/dist/app.js vendored
View File

@ -21583,8 +21583,8 @@ System.register('flarum/models/Discussion', ['flarum/Model', 'flarum/utils/compu
hideTime: Model.attribute('hideTime', Model.transformDate),
hideUser: Model.hasOne('hideUser'),
isHidden: computed('hideTime', 'commentsCount', function (hideTime, commentsCount) {
return !!hideTime || commentsCount === 0;
isHidden: computed('hideTime', function (hideTime) {
return !!hideTime;
}),
canReply: Model.attribute('canReply'),

31
js/forum/dist/app.js vendored
View File

@ -29107,8 +29107,8 @@ System.register('flarum/models/Discussion', ['flarum/Model', 'flarum/utils/compu
hideTime: Model.attribute('hideTime', Model.transformDate),
hideUser: Model.hasOne('hideUser'),
isHidden: computed('hideTime', 'commentsCount', function (hideTime, commentsCount) {
return !!hideTime || commentsCount === 0;
isHidden: computed('hideTime', function (hideTime) {
return !!hideTime;
}),
canReply: Model.attribute('canReply'),
@ -30179,19 +30179,22 @@ System.register('flarum/utils/DiscussionControls', ['flarum/components/Discussio
onclick: this.hideAction.bind(discussion)
}));
}
} else if (discussion.canDelete()) {
items.add('restore', Button.component({
icon: 'reply',
children: app.translator.trans('core.forum.discussion_controls.restore_button'),
onclick: this.restoreAction.bind(discussion),
disabled: discussion.commentsCount() === 0
}));
} else {
if (discussion.canHide()) {
items.add('restore', Button.component({
icon: 'reply',
children: app.translator.trans('core.forum.discussion_controls.restore_button'),
onclick: this.restoreAction.bind(discussion)
}));
}
items.add('delete', Button.component({
icon: 'times',
children: app.translator.trans('core.forum.discussion_controls.delete_forever_button'),
onclick: this.deleteAction.bind(discussion)
}));
if (discussion.canDelete()) {
items.add('delete', Button.component({
icon: 'times',
children: app.translator.trans('core.forum.discussion_controls.delete_forever_button'),
onclick: this.deleteAction.bind(discussion)
}));
}
}
return items;

27
js/forum/src/utils/DiscussionControls.js
View File

@ -113,19 +113,22 @@ export default {
onclick: this.hideAction.bind(discussion)
}));
}
} else if (discussion.canDelete()) {
items.add('restore', Button.component({
icon: 'reply',
children: app.translator.trans('core.forum.discussion_controls.restore_button'),
onclick: this.restoreAction.bind(discussion),
disabled: discussion.commentsCount() === 0
}));
} else {
if (discussion.canHide()) {
items.add('restore', Button.component({
icon: 'reply',
children: app.translator.trans('core.forum.discussion_controls.restore_button'),
onclick: this.restoreAction.bind(discussion)
}));
}
items.add('delete', Button.component({
icon: 'times',
children: app.translator.trans('core.forum.discussion_controls.delete_forever_button'),
onclick: this.deleteAction.bind(discussion)
}));
if (discussion.canDelete()) {
items.add('delete', Button.component({
icon: 'times',
children: app.translator.trans('core.forum.discussion_controls.delete_forever_button'),
onclick: this.deleteAction.bind(discussion)
}));
}
}
return items;

2
js/lib/models/Discussion.js
View File

@ -30,7 +30,7 @@ Object.assign(Discussion.prototype, {
hideTime: Model.attribute('hideTime', Model.transformDate),
hideUser: Model.hasOne('hideUser'),
isHidden: computed('hideTime', 'commentsCount', (hideTime, commentsCount) => !!hideTime || commentsCount === 0),
isHidden: computed('hideTime', hideTime => !!hideTime),
canReply: Model.attribute('canReply'),
canRename: Model.attribute('canRename'),