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

Fixing List changes

Browse Source
This commit is contained in:
Sebastien Ros
2014-03-28 10:25:47 -07:00
parent aacae5451c
commit 3e723c882b
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Orchard.Web/Core/Containers/Migrations.cs
View File

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

4
src/Orchard.Web/Modules/Orchard.Lists/Projections/ListSortCriteria.cs
View File

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