FIX: staff should always be allowed to create polls if they are enabled

This commit is contained in:
Joffrey JAFFEUX
2017-12-05 00:03:56 +01:00
committed by GitHub
parent 4af4081c39
commit 316d814130
8 changed files with 20 additions and 104 deletions

View File

@ -4,15 +4,12 @@ import showModal from 'discourse/lib/show-modal';
function initializePollUIBuilder(api) {
api.modifyClass('controller:composer', {
@computed('siteSettings.poll_enabled',
'siteSettings.poll_minimum_trust_level_to_create',
'siteSettings.poll_allow_staff_to_create')
canBuildPoll(pollEnabled, minimumTrustLevel, allowStaff) {
@computed('siteSettings.poll_enabled', 'siteSettings.poll_minimum_trust_level_to_create')
canBuildPoll(pollEnabled, minimumTrustLevel) {
return pollEnabled &&
this.currentUser &&
(
this.currentUser.admin ||
(this.currentUser.staff && allowStaff) ||
this.currentUser.staff ||
this.currentUser.trust_level >= minimumTrustLevel
);
},