mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Orchard-style code formatting in Orchard.Templates
This commit is contained in:
@@ -159,7 +159,7 @@ namespace Orchard.Templates.Controllers {
|
||||
public ActionResult Create(string id) {
|
||||
var types = GetShapeTypes();
|
||||
var typeName = String.IsNullOrWhiteSpace(id) ? types.Count() == 1 ? types.First().Name : null : id;
|
||||
return String.IsNullOrEmpty(typeName) ? CreatableTypeList() : RedirectToAction("Create", "Admin", new {area = "Contents", id = typeName});
|
||||
return String.IsNullOrEmpty(typeName) ? CreatableTypeList() : RedirectToAction("Create", "Admin", new { area = "Contents", id = typeName });
|
||||
}
|
||||
|
||||
private ActionResult CreatableTypeList() {
|
||||
|
||||
@@ -36,19 +36,19 @@ namespace Orchard.Templates.Drivers {
|
||||
Template = part.Template
|
||||
};
|
||||
|
||||
if (updater != null
|
||||
if (updater != null
|
||||
&& updater.TryUpdateModel(viewModel, Prefix, null, new[] { "AvailableLanguages" })
|
||||
&& ValidateShapeName(part, updater)) {
|
||||
part.Template = viewModel.Template;
|
||||
part.Template = viewModel.Template;
|
||||
|
||||
try {
|
||||
var processor = _processors.FirstOrDefault(x => String.Equals(x.Type, part.ProcessorName, StringComparison.OrdinalIgnoreCase)) ?? _processors.First();
|
||||
processor.Verify(part.Template);
|
||||
}
|
||||
catch (Exception ex) {
|
||||
updater.AddModelError("", T("Template processing error: {0}", ex.Message));
|
||||
_transactions.Cancel();
|
||||
}
|
||||
try {
|
||||
var processor = _processors.FirstOrDefault(x => String.Equals(x.Type, part.ProcessorName, StringComparison.OrdinalIgnoreCase)) ?? _processors.First();
|
||||
processor.Verify(part.Template);
|
||||
}
|
||||
catch (Exception ex) {
|
||||
updater.AddModelError("", T("Template processing error: {0}", ex.Message));
|
||||
_transactions.Cancel();
|
||||
}
|
||||
}
|
||||
return ContentShape("Parts_Shape_Edit", () => shapeHelper.EditorTemplate(TemplateName: "Parts.Shape", Model: viewModel, Prefix: Prefix));
|
||||
}
|
||||
@@ -60,7 +60,7 @@ namespace Orchard.Templates.Drivers {
|
||||
protected override void Importing(ShapePart part, ImportContentContext context) {
|
||||
var shapeElement = context.Data.Element(part.PartDefinition.Name);
|
||||
|
||||
if(shapeElement != null)
|
||||
if (shapeElement != null)
|
||||
part.Template = shapeElement.Value;
|
||||
}
|
||||
|
||||
@@ -70,9 +70,9 @@ namespace Orchard.Templates.Drivers {
|
||||
return false;
|
||||
|
||||
var name = titleViewModel.Title;
|
||||
if (!string.IsNullOrWhiteSpace(name) &&
|
||||
name[0].IsLetter() &&
|
||||
name.All(c => c.IsLetter() || Char.IsDigit(c) || c == '.' || c == '-' )) {
|
||||
if (!string.IsNullOrWhiteSpace(name) &&
|
||||
name[0].IsLetter() &&
|
||||
name.All(c => c.IsLetter() || Char.IsDigit(c) || c == '.' || c == '-')) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace Orchard.Templates.Compilation.Razor {
|
||||
};
|
||||
|
||||
public RazorCompiler(
|
||||
ICacheManager cache,
|
||||
ICacheManager cache,
|
||||
ISignals signals) {
|
||||
_cache = cache;
|
||||
_signals = signals;
|
||||
@@ -56,15 +56,15 @@ namespace Orchard.Templates.Compilation.Razor {
|
||||
private ILogger Logger { get; set; }
|
||||
|
||||
public IRazorTemplateBase<TModel> CompileRazor<TModel>(string code, string name, IDictionary<string, object> parameters) {
|
||||
return (RazorTemplateBase<TModel>) Compile(code, name, typeof (TModel), parameters);
|
||||
return (RazorTemplateBase<TModel>)Compile(code, name, typeof(TModel), parameters);
|
||||
}
|
||||
|
||||
public IRazorTemplateBase CompileRazor(string code, string name, IDictionary<string, object> parameters) {
|
||||
return (IRazorTemplateBase) Compile(code, name, null, parameters);
|
||||
return (IRazorTemplateBase)Compile(code, name, null, parameters);
|
||||
}
|
||||
|
||||
private object Compile(string code, string name, Type modelType, IDictionary<string, object> parameters) {
|
||||
|
||||
|
||||
var cacheKey = (name ?? DynamicallyGeneratedClassName) + GetHash(code);
|
||||
var generatedClassName = name != null ? name.Strip(c => !c.IsLetter() && !Char.IsDigit(c)) : DynamicallyGeneratedClassName;
|
||||
|
||||
|
||||
@@ -3,8 +3,7 @@ using System.Web.Mvc;
|
||||
using System.Web.WebPages;
|
||||
|
||||
namespace Orchard.Templates.Compilation.Razor {
|
||||
public interface IRazorTemplateBase
|
||||
{
|
||||
public interface IRazorTemplateBase {
|
||||
dynamic Model { get; }
|
||||
WebPageContext WebPageContext { get; set; }
|
||||
ViewContext ViewContext { get; set; }
|
||||
@@ -15,8 +14,7 @@ namespace Orchard.Templates.Compilation.Razor {
|
||||
|
||||
}
|
||||
|
||||
public interface IRazorTemplateBase<TModel> : IRazorTemplateBase
|
||||
{
|
||||
public interface IRazorTemplateBase<TModel> : IRazorTemplateBase {
|
||||
new TModel Model { get; }
|
||||
new ViewDataDictionary<TModel> ViewData { get; set; }
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace Orchard.Templates.Services {
|
||||
}
|
||||
|
||||
public RazorTemplateProcessor(
|
||||
IRazorCompiler compiler,
|
||||
IRazorCompiler compiler,
|
||||
HttpContextBase httpContextBase) {
|
||||
_compiler = compiler;
|
||||
_httpContextBase = httpContextBase;
|
||||
@@ -58,7 +58,7 @@ namespace Orchard.Templates.Services {
|
||||
obj.WebPageContext = new WebPageContext(displayContext.ViewContext.HttpContext, obj as WebPageRenderingBase, model);
|
||||
obj.ViewContext = shapeViewContext;
|
||||
|
||||
obj.ViewData = new ViewDataDictionary(displayContext.ViewDataContainer.ViewData) {Model = model};
|
||||
obj.ViewData = new ViewDataDictionary(displayContext.ViewDataContainer.ViewData) { Model = model };
|
||||
obj.InitHelpers();
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -15,8 +15,8 @@ namespace Orchard.Templates.Services {
|
||||
private IContentManager _contentManager;
|
||||
private ITemplateService _templateService;
|
||||
|
||||
public TemplateShapeDisplayEvent (
|
||||
ICacheManager cacheManager,
|
||||
public TemplateShapeDisplayEvent(
|
||||
ICacheManager cacheManager,
|
||||
ISignals signals,
|
||||
IContentManager contentManager,
|
||||
ITemplateService templateService
|
||||
@@ -41,7 +41,7 @@ namespace Orchard.Templates.Services {
|
||||
|
||||
public IDictionary<string, Func<dynamic, IHtmlString>> BuildShapeProcessors() {
|
||||
return _cacheManager.Get("Template.ShapeProcessors", ctx => {
|
||||
ctx.Monitor(_signals.When(DefaultTemplateService.TemplatesSignal));
|
||||
ctx.Monitor(_signals.When(DefaultTemplateService.TemplatesSignal));
|
||||
|
||||
var allTemplates = _contentManager.Query<ShapePart>().List();
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace Orchard.Templates.Settings {
|
||||
AvailableProcessors = _processors.ToArray()
|
||||
};
|
||||
|
||||
updateModel.TryUpdateModel(model, "ShapePartSettingsViewModel", new[] {"Processor"}, null);
|
||||
updateModel.TryUpdateModel(model, "ShapePartSettingsViewModel", new[] { "Processor" }, null);
|
||||
builder.WithSetting("ShapePartSettings.Processor", model.Processor);
|
||||
yield return DefinitionTemplate(model);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user