IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting

Browse Source 
add newuser-max-attachments setting
This commit is contained in:
Robin Ward
2013-07-22 07:22:23 -07:00
parent ceb36a62c8 2986798ba7
commit 8b181e0803
13 changed files with 120 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/assets/javascripts/discourse/components/utilities.js
View File

@@ -174,9 +174,13 @@ Discourse.Utilities = {
return false;
}
var upload = files[0];
// ensures that new users can upload image
if (Discourse.User.current('trust_level') === 0 && Discourse.SiteSettings.newuser_max_images === 0) {
bootbox.alert(I18n.t('post.errors.upload_not_allowed_for_new_user'));
// ensures that new users can upload image/attachment
if (Discourse.Utilities.isUploadForbidden(upload.name)) {
if (Discourse.Utilities.isAnImage(upload.name)) {
bootbox.alert(I18n.t('post.errors.image_upload_not_allowed_for_new_user'));
} else {
bootbox.alert(I18n.t('post.errors.attachment_upload_not_allowed_for_new_user'));
}
return false;
}
// if the image was pasted, sets its name to a default one
@@ -242,6 +246,17 @@ Discourse.Utilities = {
**/
maxUploadSizeInKB: function(path) {
return Discourse.Utilities.isAnImage(path) ? Discourse.SiteSettings.max_image_size_kb : Discourse.SiteSettings.max_attachment_size_kb;
},
/**
Test whether an upload is forbidden or not
@method isUploadForbidden
@param {String} path The path
**/
isUploadForbidden: function(path) {
if (Discourse.User.current('trust_level') > 0) { return false; }
return Discourse.Utilities.isAnImage(path) ? Discourse.SiteSettings.newuser_max_images === 0 : Discourse.SiteSettings.newuser_max_attachments === 0;
}
};