diff --git a/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6 index 31a659a054a..57bd7fa49ba 100644 --- a/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6 +++ b/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6 @@ -6,7 +6,7 @@ export default Ember.Component.extend({ showModal("admin-uploaded-image-list", { admin: true, title: `admin.site_settings.${setting.setting}.title`, - model: { value, setting }, + model: { value, setting } }).setProperties({ save: v => this.set("value", v) }); diff --git a/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6 index 2fe70259c83..671e96cfabb 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6 @@ -1,8 +1,7 @@ import { on, observes } from "ember-addons/ember-computed-decorators"; -import ModalFunctionality from 'discourse/mixins/modal-functionality'; +import ModalFunctionality from "discourse/mixins/modal-functionality"; export default Ember.Controller.extend(ModalFunctionality, { - @on("init") @observes("model.value") _setup() { diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6 index 997917def11..e00f14f4b3a 100644 --- a/app/assets/javascripts/admin/mixins/setting-component.js.es6 +++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6 @@ -10,7 +10,7 @@ const CUSTOM_TYPES = [ "category_list", "value_list", "category", - "uploaded_image_list", + "uploaded_image_list" ]; export default Ember.Mixin.create({ diff --git a/app/assets/javascripts/discourse/components/images-uploader.js.es6 b/app/assets/javascripts/discourse/components/images-uploader.js.es6 index a4114b77ad4..8c4bca5125a 100644 --- a/app/assets/javascripts/discourse/components/images-uploader.js.es6 +++ b/app/assets/javascripts/discourse/components/images-uploader.js.es6 @@ -7,7 +7,9 @@ export default Em.Component.extend(UploadMixin, { @computed("uploading") uploadButtonText(uploading) { - return uploading ? I18n.t("uploading") : I18n.t("user.change_avatar.upload_picture"); + return uploading + ? I18n.t("uploading") + : I18n.t("user.change_avatar.upload_picture"); }, validateUploadedFilesOptions() { @@ -16,5 +18,5 @@ export default Em.Component.extend(UploadMixin, { uploadDone(upload) { this.sendAction("done", upload); - }, + } }); diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index f1578bfe710..b0d7fe60163 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -520,9 +520,11 @@ const User = RestModel.extend({ }, isAllowedToUploadAFile(type) { - return this.get("staff") || + return ( + this.get("staff") || this.get("trust_level") > 0 || - Discourse.SiteSettings[`newuser_max_${type}s`] > 0; + Discourse.SiteSettings[`newuser_max_${type}s`] > 0 + ); }, createInvite(email, group_names, custom_message) { diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6 index e49c0125160..84f2469b57c 100644 --- a/app/assets/javascripts/discourse/routes/preferences.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences.js.es6 @@ -38,8 +38,9 @@ export default RestrictedUserRoute.extend({ controller.setProperties(props); if (this.siteSettings.selectable_avatars_enabled) { - ajax("/site/selectable-avatars.json") - .then(avatars => controller.set("selectableAvatars", avatars)); + ajax("/site/selectable-avatars.json").then(avatars => + controller.set("selectableAvatars", avatars) + ); } }, diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss index 9c40a476b1d..90df1c5e43d 100644 --- a/app/assets/stylesheets/common/admin/settings.scss +++ b/app/assets/stylesheets/common/admin/settings.scss @@ -106,4 +106,3 @@ color: $danger; } } - diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6 index bf0f1ea68c7..cfc58e01423 100644 --- a/test/javascripts/acceptance/preferences-test.js.es6 +++ b/test/javascripts/acceptance/preferences-test.js.es6 @@ -191,7 +191,9 @@ QUnit.test("selectable avatars", assert => { click(".pref-avatar .btn"); andThen(() => { - assert.ok(exists(".selectable-avatars", "opens the avatar selection modal")); + assert.ok( + exists(".selectable-avatars", "opens the avatar selection modal") + ); }); });