lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-20 03:59:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Moved list views to *Container* module itself.

Browse Source 
The reason for doing this is that the Container module itself queries for available _ListViewProviders_, which could potentially yield zero providers if the *Lists* module is not enabled.
This commit is contained in:
Sipke Schoorstra
2015-03-04 11:49:56 +01:00
parent 657a285650
commit 395e8753c7
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Containers/Handlers/ContainerPartHandler.cs
View File

@@ -64,7 +64,7 @@ namespace Orchard.Core.Containers.Handlers {
? part.Record.AdminListViewName
: !String.IsNullOrWhiteSpace(part.ContainerSettings.AdminListViewName)
? part.ContainerSettings.AdminListViewName
: providers.First().Name;
: providers.Any() ? providers.First().Name : null;
return _listViewService.GetProvider(listViewProviderName) ?? _listViewService.GetDefaultProvider();
});

2
src/Orchard.Web/Modules/Orchard.Lists/ListViews/CondensedListView.cs → src/Orchard.Web/Core/Containers/ListViews/CondensedListView.cs
View File

@@ -2,7 +2,7 @@
using Orchard.ContentManagement;
using Orchard.Core.Containers.Services;
namespace Orchard.Lists.ListViews {
namespace Orchard.Core.Containers.ListViews {
public class CondensedListView : ListViewProviderBase {
private readonly IContentManager _contentManager;
public CondensedListView(IContentManager contentManager) {

2
src/Orchard.Web/Modules/Orchard.Lists/ListViews/DefaultListView.cs → src/Orchard.Web/Core/Containers/ListViews/DefaultListView.cs
View File

@@ -2,7 +2,7 @@
using Orchard.ContentManagement;
using Orchard.Core.Containers.Services;
namespace Orchard.Lists.ListViews {
namespace Orchard.Core.Containers.ListViews {
public class DefaultListView : ListViewProviderBase {
private readonly IContentManager _contentManager;
public DefaultListView(IContentManager contentManager) {

2
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -113,6 +113,8 @@
<Compile Include="Containers\Handlers\ContainablePartHandler.cs" />
<Compile Include="Containers\Handlers\ContainerPartHandler.cs" />
<Compile Include="Containers\Handlers\ContainerWidgetPartHandler.cs" />
<Compile Include="Containers\ListViews\CondensedListView.cs" />
<Compile Include="Containers\ListViews\DefaultListView.cs" />
<Compile Include="Containers\Migrations.cs" />
<Compile Include="Containers\Models\ContainablePart.cs" />
<Compile Include="Containers\Models\OrderByDirection.cs" />

2
src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
View File

@@ -72,8 +72,6 @@
<Compile Include="Forms\ListFilterForm.cs" />
<Compile Include="Handlers\ContainerPartHandler.cs" />
<Compile Include="Helpers\StringExtensions.cs" />
<Compile Include="ListViews\CondensedListView.cs" />
<Compile Include="ListViews\DefaultListView.cs" />
<Compile Include="Services\IFilterProvider.cs" />
<Compile Include="Projections\ListFilter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />