Skip to content

Commit 84ae1cd

Browse files
Merge pull request #102 from davidsonsousa/develop
Develop
2 parents 8ead5bf + 218477e commit 84ae1cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1085
-184
lines changed

CmsEngine.Application/CmsEngine.Application.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
99
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
1010
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
11-
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
11+
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

CmsEngine.Application/Extensions/Mapper/PageExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public static IEnumerable<PageTableViewModel> MapToTableViewModel(this IEnumerab
119119
Slug = item.Slug,
120120
PublishedOn = item.PublishedOn.ToString(),
121121
Status = item.Status,
122-
Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
122+
Author = item.ApplicationUsers.MapToViewModelSimple().Single()
123123
});
124124
}
125125

@@ -142,7 +142,7 @@ public static PageViewModel MapToViewModel(this Page item)
142142
DocumentContent = item.DocumentContent,
143143
HeaderImage = item.HeaderImage,
144144
PublishedOn = item.PublishedOn.ToShortDateString(),
145-
Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
145+
Author = item.ApplicationUsers.MapToViewModelSimple().Single()
146146
};
147147
}
148148

CmsEngine.Application/Extensions/Mapper/PostExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static IEnumerable<PostTableViewModel> MapToTableViewModel(this IEnumerab
121121
Slug = item.Slug,
122122
PublishedOn = item.PublishedOn.ToString(),
123123
Status = item.Status,
124-
Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
124+
Author = item.ApplicationUsers.MapToViewModelSimple().Single()
125125
});
126126
}
127127

@@ -145,7 +145,7 @@ public static PostViewModel MapToViewModel(this Post item)
145145
HeaderImage = item.HeaderImage,
146146
PublishedOn = item.PublishedOn.ToShortDateString(),
147147
Categories = item.Categories.MapToViewModelSimple(),
148-
Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
148+
Author = item.ApplicationUsers.MapToViewModelSimple().Single()
149149
};
150150
}
151151

@@ -255,7 +255,7 @@ public static IEnumerable<PostViewModel> MapToViewModelForPartialView(this IEnum
255255
HeaderImage = item.HeaderImage,
256256
PublishedOn = item.PublishedOn.ToShortDateString(),
257257
Categories = item.Categories.MapToViewModelSimple(),
258-
Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
258+
Author = item.ApplicationUsers.MapToViewModelSimple().Single()
259259
});
260260
}
261261

@@ -283,7 +283,7 @@ public static IEnumerable<PostViewModel> MapToViewModelForPartialViewForTags(thi
283283
PublishedOn = item.PublishedOn.ToShortDateString(),
284284
Categories = item.Categories.MapToViewModelSimple(),
285285
Tags = item.Tags.MapToViewModelSimple(),
286-
Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
286+
Author = item.ApplicationUsers.MapToViewModelSimple().Single()
287287
});
288288
}
289289

CmsEngine.Application/Services/EmailService.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public async Task<ReturnValue> Save(ContactForm contactForm)
4040
{
4141
logger.LogInformation("New e-mail");
4242
var message = contactForm.MapToModel();
43+
message.DateReceived = DateTime.Now;
44+
4345
await _unitOfWork.Emails.Insert(message);
4446

4547
await _unitOfWork.Save();

0 commit comments

Comments
 (0)