Merge remote-tracking branch 'upstream/1.9-int' into 1.9-int

src/Orchard.Web/Core/Shapes/Scripts/base.js

@@ -180,7 +180,8 @@
             else if (controller.is("option")) {
                 controller.parent().change(function() {
                     controller.toggleWhatYouControl();
-                }).each($(this).toggleWhatYouControl);
+                });
+                controller.each($(this).toggleWhatYouControl);
             }
         });
     });

src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js

@@ -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
                 });
             });
 

src/Orchard.Web/Modules/Orchard.ContentPicker/Views/ContentPicker.Edit.cshtml

@@ -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,7 +26,8 @@
           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>
     }

src/Orchard/Mvc/Filters/OrchardFilterProvider.cs

@@ -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)));
         }
     }
 }