From 25f08a3af63f3a2834fed7aa706b4b432a49927c Mon Sep 17 00:00:00 2001 From: EngincanV Date: Mon, 8 Feb 2021 16:46:46 +0300 Subject: [PATCH] Fix organization profile image size with proper width and height --- src/EventHub.Web/Pages/Organizations/Edit.cshtml | 2 +- src/EventHub.Web/Pages/Organizations/Edit.cshtml.cs | 1 - src/EventHub.Web/Pages/Organizations/Edit.js | 4 ++++ src/EventHub.Web/Pages/Organizations/Index.cshtml | 4 ++-- src/EventHub.Web/Pages/Organizations/Profile.cshtml | 6 +++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/EventHub.Web/Pages/Organizations/Edit.cshtml b/src/EventHub.Web/Pages/Organizations/Edit.cshtml index 1357fc2..da45267 100644 --- a/src/EventHub.Web/Pages/Organizations/Edit.cshtml +++ b/src/EventHub.Web/Pages/Organizations/Edit.cshtml @@ -34,7 +34,7 @@
- + @L["OrganizationProfilePictureInfo"]
diff --git a/src/EventHub.Web/Pages/Organizations/Edit.cshtml.cs b/src/EventHub.Web/Pages/Organizations/Edit.cshtml.cs index fb7d634..7377b0d 100644 --- a/src/EventHub.Web/Pages/Organizations/Edit.cshtml.cs +++ b/src/EventHub.Web/Pages/Organizations/Edit.cshtml.cs @@ -86,7 +86,6 @@ namespace EventHub.Web.Pages.Organizations [Required] public Guid OrganizationId { get; set; } - [Required] [DataType(DataType.Upload)] [MaxFileSize(OrganizationConsts.MaxProfilePictureFileSize)] [AllowedExtensions(new string[] { ".jpg", ".png", ".jpeg" })] diff --git a/src/EventHub.Web/Pages/Organizations/Edit.js b/src/EventHub.Web/Pages/Organizations/Edit.js index 3506144..4f9cacf 100644 --- a/src/EventHub.Web/Pages/Organizations/Edit.js +++ b/src/EventHub.Web/Pages/Organizations/Edit.js @@ -76,6 +76,10 @@ $(function () { var organizationId = document.getElementById("organization-id").value; var organizationName = document.getElementById("organization-name").value; + if(file === undefined) { + file = null; + } + var formData = new FormData(); formData.append("OrganizationId", organizationId); formData.append("ProfilePictureFile", file); diff --git a/src/EventHub.Web/Pages/Organizations/Index.cshtml b/src/EventHub.Web/Pages/Organizations/Index.cshtml index 3fddf3b..e261e87 100644 --- a/src/EventHub.Web/Pages/Organizations/Index.cshtml +++ b/src/EventHub.Web/Pages/Organizations/Index.cshtml @@ -11,11 +11,11 @@ @if (organization.ProfilePictureContent == null) { - @organization.DisplayName + @organization.DisplayName } else { - @organization.DisplayName + @organization.DisplayName } @organization.DisplayName diff --git a/src/EventHub.Web/Pages/Organizations/Profile.cshtml b/src/EventHub.Web/Pages/Organizations/Profile.cshtml index adfeb70..0580193 100644 --- a/src/EventHub.Web/Pages/Organizations/Profile.cshtml +++ b/src/EventHub.Web/Pages/Organizations/Profile.cshtml @@ -11,14 +11,14 @@ - + @if (Model.Organization.ProfilePictureContent == null) { - @Model.Organization.DisplayName + @Model.Organization.DisplayName } else { - @Model.Organization.DisplayName + @Model.Organization.DisplayName }