lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Incremental work towards cache/volatile system

Browse Source 
--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-05-14 22:30:16 -07:00
parent fba838f366
commit c138cc996d
40 changed files with 396 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj
View File

@@ -73,7 +73,6 @@
<Compile Include="Models\ShowDebugLink.cs" />
<Compile Include="Models\Simple.cs" />
<Compile Include="Permissions.cs" />
<Compile Include="Profiler.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ViewModels\ContentIndexViewModel.cs" />
<Compile Include="ViewModels\ContentDetailsViewModel.cs" />

13
src/Orchard.Web/Modules/Orchard.DevTools/Profiler.cs
View File

@@ -1,13 +0,0 @@
using Orchard.Environment;
namespace Orchard.DevTools {
public class Profiler : IOrchardShellEvents {
public void Activated() {
HibernatingRhinos.Profiler.Appender.NHibernate.NHibernateProfiler.Initialize();
}
public void Terminating() {
}
}
}

2
src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
View File

@@ -8,8 +8,8 @@ using Orchard.Core.Navigation.Models;
using Orchard.Core.Settings.Models;
using Orchard.Data;
using Orchard.Environment;
using Orchard.Environment.Configuration;
using Orchard.Environment.Extensions;
using Orchard.Environment.FileSystems;
using Orchard.Environment.ShellBuilders;
using Orchard.Environment.Topology;
using Orchard.Environment.Topology.Models;

14
src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
View File

@@ -57,7 +57,7 @@ namespace Orchard.Users.Controllers {
[HttpPost]
[SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings",
Justification = "Needs to take same parameter type as Controller.Redirect()")]
public ActionResult LogOn(string userNameOrEmail, string password, bool rememberMe) {
public ActionResult LogOn(string userNameOrEmail, string password, bool rememberMe, string returnUrl) {
var user = ValidateLogOn(userNameOrEmail, password);
if (!ModelState.IsValid) {
return View("LogOn", new LogOnViewModel {Title = "Log On"});
@@ -65,13 +65,19 @@ namespace Orchard.Users.Controllers {
_authenticationService.SignIn(user, rememberMe);
return this.ReturnUrlRedirect();
if (string.IsNullOrEmpty(returnUrl))
return new RedirectResult("~/");
return new RedirectResult(returnUrl);
}
public ActionResult LogOff() {
public ActionResult LogOff(string returnUrl) {
_authenticationService.SignOut();
return this.ReturnUrlRedirect();
if (string.IsNullOrEmpty(returnUrl))
return new RedirectResult("~/");
return new RedirectResult(returnUrl);
}
int MinPasswordLength {