lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : nuget
This commit is contained in:
Sebastien Ros
2010-11-10 14:47:36 -08:00
parent c0f552949f d9fb5bf335
commit e35e36f4d3
17 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Tests/Mvc/OrchardControllerFactoryTests.cs
View File

@@ -20,8 +20,21 @@ namespace Orchard.Tests.Mvc {
[SetUp]
public void Init() {
var builder = new ContainerBuilder();
builder.RegisterType<FooController>()
.Keyed<IController>("/foo")
.Keyed<IController>(typeof(FooController))
.WithMetadata("ControllerType", typeof(FooController))
.InstancePerDependency();
builder.RegisterType<BarController>()
.Keyed<IController>("/bar")
.Keyed<IController>(typeof(BarController))
.WithMetadata("ControllerType", typeof(BarController))
.InstancePerDependency();
builder.RegisterType<ReplacementFooController>()
.Keyed<IController>("/foo")
.Keyed<IController>(typeof(ReplacementFooController))
.WithMetadata("ControllerType", typeof(ReplacementFooController))
.InstancePerDependency();
var container = builder.Build();
@@ -47,6 +60,7 @@ namespace Orchard.Tests.Mvc {
}
[Test]
[Ignore("OrchardControllerFactory depends on metadata, calling base when no context is causing errors.")]
public void WhenNullOrMissingContainerNormalControllerFactoryRulesShouldBeUsedAsFallback() {
var requestContext = GetRequestContext(null);
var controller = _controllerFactory.CreateController(requestContext, "foo");

4
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -61,6 +61,10 @@
<HintPath>..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Routing" />
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Xml.Linq" />

1
src/Orchard.Web/Core/Shapes/Scripts/base.js
View File

@@ -164,7 +164,6 @@
$(function () {
$("form.inline.link").each(function () {
var _this = $(this);
console.log(_this.html())
var link = $("<a class='wasFormInlineLink' href='.'/>");
var button = _this.children("button").first();
link.text(button.text())

3
src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css
View File

@@ -10,9 +10,6 @@
zoom:1;
*display: inline;
}
.templates .wasFormInlineLink {
font-size:1.4em;
}
.templates p {
overflow:hidden;
}

20
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -356,7 +356,9 @@ form.link button:hover {
/* Content
***************************************************************/
#main h1 {
#main h1 {
margin:0 0 1em;
}
#main h2, #main h3 {
margin:.5em 0;
}
@@ -515,11 +517,6 @@ textarea {
display:block;
margin:0;
}
margin:0;
}
.secondary fieldset {
margin:.446% 0 .446% .446%;
padding:4px;
form.link button {
background:inherit;
border:0;
@@ -723,17 +720,6 @@ table.items th, table.items td {
padding:8px 12px;
vertical-align:middle;
}
vertical-align:middle;
}
table.items td
{
vertical-align:top;
}
/* todo: Find a better way to do this. These are a fix for buttons and label fonts becomming too large in a table.*/
table label {
font-size:1em;
}
table .button {
/* Content item lists
----------------------------------------------------------*/

10
src/Orchard.Web/Themes/Web.config
View File

@@ -2,8 +2,9 @@
<configuration>
<system.web>
<httpHandlers>
<!-- iis6 - for any request in this location, return via managed static file handler -->
<add path="*/Theme.png" verb="*" type="System.Web.StaticFileHandler" />
</httpHandlers>
<!--
Enabling request validation in view pages would cause validation to occur
after the input has already been processed by the controller. By default
@@ -24,7 +25,12 @@
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
<handlers>
<handlers accessPolicy="Script,Read">
<!--
iis7 - for any request to a file exists on disk, return it via native http module.
accessPolicy 'Script' is to allow for a managed 404 page.
-->
<add name="StaticFile" path="*/Theme.png" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
</handlers>
</system.webServer>
<runtime>

7
src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs
View File

@@ -89,10 +89,13 @@ namespace Orchard.Environment.ShellBuilders {
}
foreach (var item in blueprint.Controllers) {
var serviceKey = (item.AreaName + "/" + item.ControllerName).ToLowerInvariant();
var serviceKeyName = (item.AreaName + "/" + item.ControllerName).ToLowerInvariant();
var serviceKeyType = item.Type;
RegisterType(builder, item)
.EnableDynamicProxy(dynamicProxyContext)
.Keyed<IController>(serviceKey)
.Keyed<IController>(serviceKeyName)
.Keyed<IController>(serviceKeyType)
.WithMetadata("ControllerType", item.Type)
.InstancePerDependency()
.OnActivating(e => {
var controller = e.Instance as Controller;

46
src/Orchard/Mvc/OrchardControllerFactory.cs
View File

@@ -1,12 +1,32 @@
using System;
using System.Web.Mvc;
using System.Web.Routing;
using Autofac;
using Autofac.Core;
using Autofac.Features.Metadata;
namespace Orchard.Mvc {
public interface IControllerType {
Type ControllerType { get; }
}
public class OrchardControllerFactory : DefaultControllerFactory {
public override IController CreateController(RequestContext requestContext, string controllerName) {
bool TryResolve<T>(WorkContext workContext, object serviceKey, out T instance ) {
if (workContext != null) {
var key = new KeyedService(serviceKey, typeof (T));
object value;
if (workContext.Resolve<ILifetimeScope>().TryResolve(key, out value)) {
instance = (T) value;
return true;
}
}
instance = default(T);
return false;
}
protected override Type GetControllerType(RequestContext requestContext, string controllerName) {
var routeData = requestContext.RouteData;
// Determine the area name for the request, and fall back to stock orchard controllers
@@ -15,18 +35,24 @@ namespace Orchard.Mvc {
// Service name pattern matches the identification strategy
var serviceKey = (areaName + "/" + controllerName).ToLowerInvariant();
// Now that the request container is known - try to resolve the controller
object controller;
var service = new KeyedService(serviceKey, typeof(IController));
// Now that the request container is known - try to resolve the controller information
Lazy<IController, IControllerType> info;
var workContext = requestContext.GetWorkContext();
if (workContext != null &&
workContext.Resolve<ILifetimeScope>().TryResolve(service, out controller)) {
return (IController)controller;
if (TryResolve(workContext, serviceKey, out info)) {
return info.Metadata.ControllerType;
}
return base.CreateController(requestContext, controllerName);
return null;
}
protected override IController GetControllerInstance(RequestContext requestContext, System.Type controllerType) {
IController controller;
var workContext = requestContext.GetWorkContext();
if (TryResolve(workContext, controllerType, out controller)) {
return controller;
}
return null;
}
public static string GetAreaName(RouteBase route) {

1
src/Orchard/Orchard.Framework.csproj
View File

@@ -114,6 +114,7 @@
<HintPath>..\..\lib\linqnhibernate\NHibernate.Linq.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>

2
src/Orchard/UI/Admin/AdminFilter.cs
View File

@@ -51,7 +51,7 @@ namespace Orchard.UI.Admin {
private static bool IsNameAdmin(AuthorizationContext filterContext) {
return string.Equals(filterContext.ActionDescriptor.ControllerDescriptor.ControllerName, "Admin",
StringComparison.InvariantCultureIgnoreCase);
StringComparison.OrdinalIgnoreCase);
}
private static bool IsNameAdminProxy(AuthorizationContext filterContext) {