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

Merge branch '1.8.x' into 1.9-int

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-04-27 16:04:17 +02:00
parent 20adb3bf51 e557151b28
commit 02fbd2e1f2
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,9 +178,10 @@
$("[name=" + controller.attr("name") + "]").click(function () { $("[name=" + $(this).attr("name") + "]").each($(this).toggleWhatYouControl); });
}
else if (controller.is("option")) {
controller.parent().change(function () {
controller.parent().change(function() {
controller.toggleWhatYouControl();
}).each($(this).toggleWhatYouControl);
});
controller.each($(this).toggleWhatYouControl);
}
});
});

4
src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js
View File

@@ -54,6 +54,7 @@
var baseUrl = $(self).data("base-url");
var partName = $(self).data("part-name");
var fieldName = $(self).data("field-name");
var types = $(self).data("types");
var refreshIds = function() {
var id = $("[name='" + selectedItemsFieldname + "']");
@@ -90,7 +91,8 @@
},
baseUrl: baseUrl,
part: partName,
field: fieldName
field: fieldName,
types: types
});
});

12
src/Orchard.Web/Modules/Orchard.ContentPicker/Views/ContentPicker.Edit.cshtml
View File

@@ -15,6 +15,7 @@
var partName = Model.PartName;
var fieldName = Model.FieldName;
var baseUrl = Url.Content("~/") + WorkContext.Resolve<ShellSettings>().RequestUrlPrefix;
var types = String.Join(",", (IEnumerable<string>)Model.Types ?? Enumerable.Empty<string>());
}
<fieldset class="content-picker-field"
@@ -25,9 +26,10 @@
data-part-name="@HttpUtility.JavaScriptStringEncode(partName)"
data-field-name="@HttpUtility.JavaScriptStringEncode(fieldName)"
data-remove-text="@T("Remove")"
data-not-published-text="@T("Not Published")">
data-not-published-text="@T("Not Published")"
data-types="@types">
@if (!String.IsNullOrWhiteSpace(displayName)) {
<label @if(required) { <text>class="required"</text> }>@displayName</label>
<label @if (required) { <text> class="required" </text> }>@displayName</label>
}
<div class="message message-Warning content-picker-message">@T("You need to save your changes.")</div>
<table class="items content-picker" summary="@displayName">
@@ -38,7 +40,7 @@
</colgroup>
<thead>
<tr>
<th scope="col" >&nbsp;&darr;</th>
<th scope="col">&nbsp;&darr;</th>
<th scope="col">@T("Content Item")</th>
<th scope="col">&nbsp;</th>
</tr>
@@ -48,7 +50,7 @@
<tr>
<td>&nbsp;</td>
<td>
<span data-id="@contentItem.Id" data-fieldid="@idsFieldId" class="content-picker-item">@Html.ItemEditLink(contentItem) @if(!contentItem.HasPublished()) {<text> - </text>@T("Not Published")}</span>
<span data-id="@contentItem.Id" data-fieldid="@idsFieldId" class="content-picker-item">@Html.ItemEditLink(contentItem) @if (!contentItem.HasPublished()){<text> - </text>@T("Not Published")}</span>
</td>
<td>
<span data-id="@contentItem.Id" class="content-picker-remove button grey">@T("Remove")</span>
@@ -59,6 +61,6 @@
</table>
<span class="button add">@T("Add")</span>
<input type="hidden" name="@selectedItemsFieldName"/>
<input type="hidden" name="@selectedItemsFieldName" />
<span class="hint">@hint</span>
</fieldset>

12
src/Orchard/Mvc/Filters/OrchardFilterProvider.cs
View File

@@ -7,8 +7,16 @@ namespace Orchard.Mvc.Filters {
public IEnumerable<Filter> GetFilters(ControllerContext controllerContext, ActionDescriptor actionDescriptor) {
var workContext = controllerContext.GetWorkContext();
var filterProviders = workContext.Resolve<IEnumerable<IFilterProvider>>();
return filterProviders.Select(x => new Filter(x, FilterScope.Action, null));
// Map IFilterProvider implementations to MVC Filter objects
// Need to provide order values since Filter objects of identical
// scope and order would run in undefined order.
// We create negative order values to avoid conflicts with other
// potential user-provided MVC Filter objects, which hopefully use
// positive order values. We do this by reversing the list and
// negating the index.
var filters = workContext.Resolve<IEnumerable<IFilterProvider>>();
return filters.Reverse().Select((filter, index) => new Filter(filter, FilterScope.Action, -(index + 1)));
}
}
}