huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates following code review

This commit is contained in:
ajcvickers 2014-01-29 08:39:53 -08:00
parent 6a9b6c16c2
commit 7c96726460
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MusicStore.sln
View File

@ -10,9 +10,6 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicStore.net45", "src\MusicStore\MusicStore.net45.csproj", "{9C8A2D1F-D430-46DF-8F00-39E378EC8FB2}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicStore.net45", "src\MusicStore\MusicStore.net45.csproj", "{9C8A2D1F-D430-46DF-8F00-39E378EC8FB2}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{44621553-AA7D-4893-8834-79582A7D8348}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{44621553-AA7D-4893-8834-79582A7D8348}"
ProjectSection(SolutionItems) = preProject
.nuget\packages.config = .nuget\packages.config
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

5
src/MvcMusicStore/App_Start/Startup.App.cs
View File

@ -1,4 +1,5 @@
using System.Configuration; using System.Configuration;
using System.Threading.Tasks;
using Microsoft.AspNet.Identity; using Microsoft.AspNet.Identity;
using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.AspNet.Identity.EntityFramework;
using MvcMusicStore.Models; using MvcMusicStore.Models;
@ -20,10 +21,10 @@ namespace MvcMusicStore
new SampleData().Seed(context); new SampleData().Seed(context);
} }
CreateAdminUser(); CreateAdminUser().Wait();
} }
private async void CreateAdminUser() private async Task CreateAdminUser()
{ {
var username = ConfigurationManager.AppSettings["DefaultAdminUsername"]; var username = ConfigurationManager.AppSettings["DefaultAdminUsername"];
var password = ConfigurationManager.AppSettings["DefaultAdminPassword"]; var password = ConfigurationManager.AppSettings["DefaultAdminPassword"];

28
src/MvcMusicStore/Controllers/AccountController.cs
View File

@ -131,16 +131,24 @@ namespace MvcMusicStore.Controllers
// GET: /Account/Manage // GET: /Account/Manage
public async Task<ActionResult> Manage(ManageMessageId? message) public async Task<ActionResult> Manage(ManageMessageId? message)
{ {
ViewBag.StatusMessage = switch (message)
message == ManageMessageId.ChangePasswordSuccess {
? "Your password has been changed." case ManageMessageId.ChangePasswordSuccess:
: message == ManageMessageId.SetPasswordSuccess ViewBag.StatusMessage = "Your password has been changed.";
? "Your password has been set." break;
: message == ManageMessageId.RemoveLoginSuccess case ManageMessageId.SetPasswordSuccess:
? "The external login was removed." ViewBag.StatusMessage = "Your password has been set.";
: message == ManageMessageId.Error break;
? "An error has occurred." case ManageMessageId.RemoveLoginSuccess:
: ""; ViewBag.StatusMessage = "The external login was removed.";
break;
case ManageMessageId.Error:
ViewBag.StatusMessage = "An error has occurred.";
break;
default:
ViewBag.StatusMessage = "";
break;
}
ViewBag.HasLocalPassword = await HasPasswordAsync(); ViewBag.HasLocalPassword = await HasPasswordAsync();
ViewBag.ReturnUrl = Url.Action("Manage"); ViewBag.ReturnUrl = Url.Action("Manage");