From ad0ed008fe54534fcc089f479df606ab921901a9 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 14 Mar 2017 09:35:48 -0400 Subject: Implement brand image endpoints for APIv4 (#5733) * Implement brand image endpoints for APIv4 * Fix unit test --- app/brand.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'app/brand.go') diff --git a/app/brand.go b/app/brand.go index aeecc6972..9b3df3145 100644 --- a/app/brand.go +++ b/app/brand.go @@ -13,11 +13,13 @@ import ( ) func SaveBrandImage(imageData *multipart.FileHeader) *model.AppError { + if len(utils.Cfg.FileSettings.DriverName) == 0 { + return model.NewAppError("SaveBrandImage", "api.admin.upload_brand_image.storage.app_error", nil, "", http.StatusNotImplemented) + } + brandInterface := einterfaces.GetBrandInterface() if brandInterface == nil { - err := model.NewLocAppError("SaveBrandImage", "api.admin.upload_brand_image.not_available.app_error", nil, "") - err.StatusCode = http.StatusNotImplemented - return err + return model.NewAppError("SaveBrandImage", "api.admin.upload_brand_image.not_available.app_error", nil, "", http.StatusNotImplemented) } if err := brandInterface.SaveBrandImage(imageData); err != nil { @@ -29,16 +31,12 @@ func SaveBrandImage(imageData *multipart.FileHeader) *model.AppError { func GetBrandImage() ([]byte, *model.AppError) { if len(utils.Cfg.FileSettings.DriverName) == 0 { - err := model.NewLocAppError("GetBrandImage", "api.admin.get_brand_image.storage.app_error", nil, "") - err.StatusCode = http.StatusNotImplemented - return nil, err + return nil, model.NewAppError("GetBrandImage", "api.admin.get_brand_image.storage.app_error", nil, "", http.StatusNotImplemented) } brandInterface := einterfaces.GetBrandInterface() if brandInterface == nil { - err := model.NewLocAppError("GetBrandImage", "api.admin.get_brand_image.not_available.app_error", nil, "") - err.StatusCode = http.StatusNotImplemented - return nil, err + return nil, model.NewAppError("GetBrandImage", "api.admin.get_brand_image.not_available.app_error", nil, "", http.StatusNotImplemented) } if img, err := brandInterface.GetBrandImage(); err != nil { -- cgit v1.2.3-1-g7c22