Add s3_backup_config_warning

Note that only one of the two warnings can be shown, because they are checked in the same method.
This commit is contained in:
riking
2014-03-17 12:56:59 -07:00
parent 2cff3c20f7
commit ffd4f367e3
2 changed files with 4 additions and 1 deletions

View File

@@ -119,7 +119,9 @@ class AdminDashboardData
end
def s3_config_check
I18n.t('dashboard.s3_config_warning') if SiteSetting.enable_s3_uploads and (SiteSetting.s3_access_key_id.blank? or SiteSetting.s3_secret_access_key.blank? or SiteSetting.s3_upload_bucket.blank?)
return I18n.t('dashboard.s3_config_warning') if SiteSetting.enable_s3_uploads and (SiteSetting.s3_access_key_id.blank? or SiteSetting.s3_secret_access_key.blank? or SiteSetting.s3_upload_bucket.blank?)
return I18n.t('dashboard.s3_backup_config_warning') if SiteSetting.enable_s3_backups and (SiteSetting.s3_access_key_id.blank? or SiteSetting.s3_secret_access_key.blank? or SiteSetting.s3_backup_bucket.blank?)
nil
end
def image_magick_check