From 3e723c882bce313169f0d234e2b6f9112d2365f7 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Fri, 28 Mar 2014 10:25:47 -0700
Subject: [PATCH] Fixing List changes

---
 src/Orchard.Web/Core/Containers/Migrations.cs | 28 ++++++++++++++++---
 .../Projections/ListSortCriteria.cs           |  4 +--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Web/Core/Containers/Migrations.cs b/src/Orchard.Web/Core/Containers/Migrations.cs
index 0cbd6e55d..061ccd66e 100644
--- a/src/Orchard.Web/Core/Containers/Migrations.cs
+++ b/src/Orchard.Web/Core/Containers/Migrations.cs
@@ -48,7 +48,7 @@ namespace Orchard.Core.Containers {
                 .Attachable()
                 .WithDescription("Allows your content item to be contained by a content item that has the ContainerPart attached."));
 
-            return 5;
+            return 6;
         }
 
         public int UpdateFrom1() {
@@ -83,8 +83,6 @@ namespace Orchard.Core.Containers {
             ContentDefinitionManager.DeleteTypeDefinition("CustomPropertiesPart");
             SchemaBuilder.DropTable("CustomPropertiesPartRecord");
             SchemaBuilder.AlterTable("ContainerPartRecord", table => {
-                table.DropColumn("OrderByProperty");
-                table.DropColumn("OrderByDirection");
                 table.DropColumn("ItemContentType");
                 table.AddColumn<string>("ItemContentTypes");
                 table.AddColumn<bool>("ShowOnAdminMenu");
@@ -101,7 +99,29 @@ namespace Orchard.Core.Containers {
                 table.AddColumn<int>("Position");
             });
 
-            return 5;
+            return 6;
+        }
+
+        public int UpdateFrom5() {
+            SchemaBuilder.AlterTable("ContainerWidgetPartRecord", table => table
+                .AddColumn<string>("OrderByProperty", c => c.WithLength(64)));
+
+            SchemaBuilder.AlterTable("ContainerWidgetPartRecord", table => table
+                .AddColumn<int>("OrderByDirection"));
+
+            SchemaBuilder.AlterTable("ContainerWidgetPartRecord", table => table
+                .AddColumn<bool>("ApplyFilter"));
+
+            SchemaBuilder.AlterTable("ContainerWidgetPartRecord", table => table
+                .AddColumn<string>("FilterByProperty", c => c.WithLength(64)));
+
+            SchemaBuilder.AlterTable("ContainerWidgetPartRecord", table => table
+                .AddColumn<string>("FilterByOperator", c => c.WithLength(4)));
+
+            SchemaBuilder.AlterTable("ContainerWidgetPartRecord", table => table
+                .AddColumn<string>("FilterByValue", c => c.WithLength(128)));
+
+            return 6;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Projections/ListSortCriteria.cs b/src/Orchard.Web/Modules/Orchard.Lists/Projections/ListSortCriteria.cs
index 498aa98a6..ebd89d05a 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/Projections/ListSortCriteria.cs
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Projections/ListSortCriteria.cs
@@ -20,8 +20,8 @@ namespace Orchard.Lists.Projections {
             bool ascending = Boolean.Parse(Convert.ToString(context.State.Sort));
             var query = (IHqlQuery)context.Query;
             query = ascending
-                ? query.OrderBy(alias => alias.ContentPartRecord<ContainablePartRecord>(), x => x.Asc("Position"))
-                : query.OrderBy(alias => alias.ContentPartRecord<ContainablePartRecord>(), x => x.Desc("Position"));
+                ? query.OrderBy(alias => alias.ContentPartRecord<ContainablePartRecord>(), x => x.Desc("Position"))
+                : query.OrderBy(alias => alias.ContentPartRecord<ContainablePartRecord>(), x => x.Asc("Position"));
 
             context.Query = query;
         }