From c13cb4d7d27b024b52d941a0dbf743b8f25c9095 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Mon, 7 Mar 2011 15:31:22 -0800
Subject: [PATCH] Posting bulk actions through Javascript

--HG--
branch : dev
---
 .../Controllers/GalleryController.cs                 |  2 +-
 .../ViewModels/PackagingExtensionsViewModel.cs       |  1 -
 .../Orchard.Packaging/Views/Gallery/Modules.cshtml   | 10 +++++-----
 .../Orchard.Packaging/Views/Gallery/Themes.cshtml    | 10 +++++-----
 src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js     | 12 ++++++++++++
 src/Orchard.Web/Themes/TheAdmin/Styles/site.css      |  2 +-
 src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml  |  2 --
 src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml   |  2 +-
 8 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
index b59c29aec..ed8a77320 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
@@ -219,12 +219,12 @@ namespace Orchard.Packaging.Controllers {
             var routeData = new RouteData();
             routeData.Values.Add("Options.Order", options.Order);
             routeData.Values.Add("Options.SearchText", options.SearchText);
+            routeData.Values.Add("Options.SourceId", options.SourceId);
             pagerShape.RouteData(routeData);
 
             return View(packageType == DefaultExtensionTypes.Theme ? "Themes" : "Modules", new PackagingExtensionsViewModel {
                 Extensions = extensions,
                 Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle),
-                SelectedSource = selectedSource,
                 Pager = pagerShape,
                 Options = options
             });
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingExtensionsViewModel.cs b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingExtensionsViewModel.cs
index 39363f6bc..87084e618 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingExtensionsViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingExtensionsViewModel.cs
@@ -5,7 +5,6 @@ namespace Orchard.Packaging.ViewModels {
     public class PackagingExtensionsViewModel {
         public IEnumerable<PackagingEntry> Extensions { get; set; }
         public IEnumerable<PackagingSource> Sources { get; set; }
-        public PackagingSource SelectedSource { get; set; }
         public PackagingExtensionsOptions Options { get; set; }
         public dynamic Pager { get; set; }
     }
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml
index 98c839cba..76de9011e 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml
@@ -10,11 +10,11 @@
 
 @using (Html.BeginFormAntiForgeryPost(Url.Action("Modules", "Gallery"))) {
     <fieldset class="bulk-actions">
-        <label for="filterResults" class="bulk-filter">@T("Feed:")</label>
-        <select id="sourceId" name="sourceId">
-            @Html.SelectOption("", Model.SelectedSource == null, T("All feeds").ToString())
+        <label for="sourceId">@T("Feed:")</label>
+        <select id="sourceId" name="@Html.NameOf(m => m.Options.SourceId)">
+            @Html.SelectOption(Model.Options.SourceId, null, T("All feeds").ToString())
             @foreach (var source in Model.Sources) {
-                @Html.SelectOption(source.Id, Model.SelectedSource != null && Model.SelectedSource.Id == source.Id, source.FeedTitle)
+                @Html.SelectOption(Model.Options.SourceId, source.Id, source.FeedTitle)
             }
         </select>
     </fieldset>
@@ -27,7 +27,7 @@
             @Html.SelectOption(Model.Options.Order, PackagingExtensionsOrder.Alphanumeric, T("Alphanumeric").ToString())
         </select>
 
-        <button type="submit">@T("Apply")</button>
+        <button id="apply-bulk-actions" type="submit">@T("Apply")</button>
     </fieldset>
 
     <fieldset class="search-actions">
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml
index b7137efc9..db5ce1c05 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml
@@ -10,11 +10,11 @@
 
 @using (Html.BeginFormAntiForgeryPost(Url.Action("Themes", "Gallery"))) {
     <fieldset class="bulk-actions">
-        <label for="filterResults" class="bulk-filter">@T("Show")</label>
-        <select id="sourceId" name="sourceId">
-            @Html.SelectOption("", Model.SelectedSource == null, T("All feeds").ToString())
+        <label for="sourceId">@T("Show")</label>
+        <select id="sourceId" name="@Html.NameOf(m => m.Options.SourceId)">
+            @Html.SelectOption(Model.Options.SourceId, null, T("All feeds").ToString())
             @foreach (var source in Model.Sources) {
-                @Html.SelectOption(source.Id, Model.SelectedSource != null && Model.SelectedSource.Id == source.Id, source.FeedTitle)
+                @Html.SelectOption(Model.Options.SourceId, source.Id, source.FeedTitle)
             }
         </select>
     </fieldset>
@@ -27,7 +27,7 @@
             @Html.SelectOption(Model.Options.Order, PackagingExtensionsOrder.Alphanumeric, T("Alphanumeric").ToString())
         </select>
 
-        <button type="submit">@T("Apply")</button>
+        <button id="apply-bulk-actions" type="submit">@T("Apply")</button>
     </fieldset>
 
     <fieldset class="search-actions">
diff --git a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
index 105e35922..7b30e4bfc 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
+++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
@@ -56,4 +56,16 @@
             return this;
         }
     });
+
+    $(".bulk-actions").each(function () {
+        $("select").each(function () {
+            $(this).change(function () {
+                var self = $(this);
+                var form = self.closest("form");
+
+                // Submit form
+                form.submit();
+            });
+        });
+    });
 })(jQuery);
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 51e78f333..81b3bbf05 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -962,7 +962,7 @@ table.items th, table.items td {
 .page-size-options select {
     margin-top: 10px;
 }
-html.dyn #submit_pager { display:none; }
+html.dyn #submit-pager, html.dyn #apply-bulk-actions { display:none; }
 .pager { list-style: none; padding: 0; margin: 12px 0 0 0;}
 .pager li {
     float: left;
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
index db35faff6..b5656889e 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
@@ -34,8 +34,6 @@
     }
 }
 
-
-
 <div id="layout-content">
 
 @if (Model.Header != null) {
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml
index a882785b9..35559d59b 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml
@@ -53,7 +53,7 @@
                     }
                 </select>
 
-                <button id="submit_pager" type="submit">@T("Apply")</button>
+                <button id="submit-pager" type="submit">@T("Apply")</button>
             </div>
         }