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

Making all of the view models not inherit from BaseViewModel

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-09-01 15:33:31 -07:00
parent b85a6ed122
commit 026764544a
26 changed files with 40 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Contents/ViewModels/CreateItemViewModel.cs
View File

@@ -1,7 +1,7 @@
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Contents.ViewModels {
public class CreateItemViewModel : BaseViewModel {
public class CreateItemViewModel {
public string Id { get; set; }
public ContentItemViewModel Content { get; set; }
}

2
src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs
View File

@@ -1,7 +1,7 @@
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Contents.ViewModels {
public class EditItemViewModel : BaseViewModel {
public class EditItemViewModel {
public int Id { get; set; }
public ContentItemViewModel Content { get; set; }
}

6
src/Orchard.Web/Core/Contents/ViewModels/ListContentTypesViewModel.cs
View File

@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using Orchard.ContentManagement.MetaData.Models;
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Contents.ViewModels {
public class ListContentTypesViewModel : BaseViewModel {
public class ListContentTypesViewModel {
public IEnumerable<ContentTypeDefinition> Types { get; set; }
}
}

2
src/Orchard.Web/Core/Contents/ViewModels/ListContentsViewModel.cs
View File

@@ -3,7 +3,7 @@ using Orchard.ContentManagement;
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Contents.ViewModels {
public class ListContentsViewModel : BaseViewModel {
public class ListContentsViewModel {
public ListContentsViewModel() {
Options = new ContentOptions();
}

2
src/Orchard.Web/Core/Localization/ViewModels/AddLocalizationViewModel.cs
View File

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Localization.ViewModels {
public class AddLocalizationViewModel : BaseViewModel {
public class AddLocalizationViewModel {
public int Id { get; set; }
[Required]
public string SelectedCulture { get; set; }

3
src/Orchard.Web/Core/Localization/ViewModels/EditLocalizationViewModel.cs
View File

@@ -1,9 +1,8 @@
using System.Collections.Generic;
using Orchard.ContentManagement;
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Localization.ViewModels {
public class EditLocalizationViewModel : BaseViewModel {
public class EditLocalizationViewModel {
public string SelectedCulture { get; set; }
public IEnumerable<string> SiteCultures { get; set; }
public IContent ContentItem { get; set; }

2
src/Orchard.Web/Core/Navigation/ViewModels/CreateMenuItemViewModel.cs
View File

@@ -2,7 +2,7 @@ using Orchard.Core.Navigation.Models;
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Navigation.ViewModels {
public class CreateMenuItemViewModel : BaseViewModel {
public class CreateMenuItemViewModel {
public ContentItemViewModel<MenuPart> MenuItem { get; set; }
}
}

3
src/Orchard.Web/Core/Navigation/ViewModels/NavigationManagementViewModel.cs
View File

@@ -1,9 +1,8 @@
using System.Collections.Generic;
using System.Linq;
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Navigation.ViewModels {
public class NavigationManagementViewModel : BaseViewModel {
public class NavigationManagementViewModel {
public NavigationManagementViewModel() {
MenuItemEntries = Enumerable.Empty<MenuItemEntry>().ToList();
}

6
src/Orchard.Web/Core/Reports/ViewModels/DisplayReportViewModel.cs
View File

@@ -1,9 +1,7 @@
using System.Collections.Generic;
using Orchard.Mvc.ViewModels;
using Orchard.Reports;
using Orchard.Reports;
namespace Orchard.Core.Reports.ViewModels {
public class DisplayReportViewModel : BaseViewModel {
public class DisplayReportViewModel {
public Report Report { get; set; }
}
}

3
src/Orchard.Web/Core/Reports/ViewModels/ReportsAdminIndexViewModel.cs
View File

@@ -1,9 +1,8 @@
using System.Collections.Generic;
using Orchard.Mvc.ViewModels;
using Orchard.Reports;
namespace Orchard.Core.Reports.ViewModels {
public class ReportsAdminIndexViewModel : BaseViewModel {
public class ReportsAdminIndexViewModel {
public IList<Report> Reports { get; set; }
}
}

2
src/Orchard.Web/Core/Routable/ViewModels/RoutableDisplayViewModel.cs
View File

@@ -2,7 +2,7 @@
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Routable.ViewModels {
public class RoutableDisplayViewModel : BaseViewModel {
public class RoutableDisplayViewModel {
public ContentItemViewModel<IRoutableAspect> Routable {get;set;}
}
}

2
src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs
View File

@@ -5,7 +5,7 @@ using Orchard.Mvc.ViewModels;
using Orchard.Core.Settings.Models;
namespace Orchard.Core.Settings.ViewModels {
public class SettingsIndexViewModel : BaseViewModel {
public class SettingsIndexViewModel {
public SiteSettingsPart Site { get; set; }
public IEnumerable<string> SiteCultures { get; set; }
public ContentItemViewModel ViewModel { get; set; }

3
src/Orchard.Web/Core/Settings/ViewModels/SiteCulturesViewModel.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic;
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Settings.ViewModels {
public class SiteCulturesViewModel : BaseViewModel {
public class SiteCulturesViewModel {
public string CurrentCulture { get; set; }
public IEnumerable<string> SiteCultures { get; set; }
public IEnumerable<string> AvailableSystemCultures { get; set; }

4
src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs
View File

@@ -1,15 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Records;
using Orchard.ContentManagement.ViewModels;
using Orchard.Mvc.ViewModels;
using Orchard.UI.Zones;
namespace Orchard.DevTools.ViewModels {
public class ContentDetailsViewModel : BaseViewModel {
public class ContentDetailsViewModel {
public IContent Item { get; set; }
public IEnumerable<Type> PartTypes { get; set; }

8
src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/ContentIndexViewModel.cs
View File

@@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Collections.Generic;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Records;
using Orchard.Mvc.ViewModels;
namespace Orchard.DevTools.ViewModels {
public class ContentIndexViewModel : BaseViewModel {
public class ContentIndexViewModel {
public IEnumerable<ContentTypeRecord> Types { get; set; }
public IEnumerable<ContentItem> Items { get; set; }
}

3
src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/MetadataIndexViewModel.cs
View File

@@ -1,9 +1,8 @@
using System.Collections.Generic;
using Orchard.ContentManagement.MetaData.Models;
using Orchard.Mvc.ViewModels;
namespace Orchard.DevTools.ViewModels {
public class MetadataIndexViewModel : BaseViewModel {
public class MetadataIndexViewModel {
public IEnumerable<ContentTypeDefinition> TypeDefinitions { get; set; }
public IEnumerable<ContentPartDefinition> PartDefinitions { get; set; }
public string ExportText { get; set; }

3
src/Orchard.Web/Modules/Orchard.Roles/ViewModels/RoleCreateViewModel.cs
View File

@@ -1,10 +1,9 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Orchard.Mvc.ViewModels;
using Orchard.Security.Permissions;
namespace Orchard.Roles.ViewModels {
public class RoleCreateViewModel : BaseViewModel {
public class RoleCreateViewModel {
[Required]
public string Name { get; set; }
public IDictionary<string, IEnumerable<Permission>> FeaturePermissions { get; set; }

3
src/Orchard.Web/Modules/Orchard.Roles/ViewModels/RoleEditViewModel.cs
View File

@@ -1,10 +1,9 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Orchard.Mvc.ViewModels;
using Orchard.Security.Permissions;
namespace Orchard.Roles.ViewModels {
public class RoleEditViewModel : BaseViewModel {
public class RoleEditViewModel {
public int Id { get; set; }
[Required]
public string Name { get; set; }

3
src/Orchard.Web/Modules/Orchard.Roles/ViewModels/RolesIndexViewModel.cs
View File

@@ -1,9 +1,8 @@
using System.Collections.Generic;
using Orchard.Mvc.ViewModels;
using Orchard.Roles.Models;
namespace Orchard.Roles.ViewModels {
public class RolesIndexViewModel : BaseViewModel {
public class RolesIndexViewModel {
public IList<RoleRecord> Rows { get; set; }
}
}

3
src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
View File

@@ -1,9 +1,8 @@
using System.ComponentModel.DataAnnotations;
using Orchard.Setup.Annotations;
using Orchard.Mvc.ViewModels;
namespace Orchard.Setup.ViewModels {
public class SetupViewModel : BaseViewModel {
public class SetupViewModel {
public SetupViewModel() {
DatabaseOptions = true;
}

20
src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeFilter.cs
View File

@@ -1,24 +1,24 @@
using System.Linq;
using System.Web.Mvc;
using Orchard.DisplayManagement;
using Orchard.Mvc.Filters;
using Orchard.Mvc.ViewModels;
using Orchard.Themes.ViewModels;
namespace Orchard.Themes.Preview {
public class PreviewThemeFilter : FilterProvider, IResultFilter {
private readonly IThemeService _themeService;
private readonly IPreviewTheme _previewTheme;
private readonly IWorkContextAccessor _workContextAccessor;
private readonly IShapeHelperFactory _shapeHelperFactory;
public PreviewThemeFilter(IThemeService themeService, IPreviewTheme previewTheme) {
public PreviewThemeFilter(IThemeService themeService, IPreviewTheme previewTheme, IWorkContextAccessor workContextAccessor, IShapeHelperFactory shapeHelperFactory) {
_themeService = themeService;
_previewTheme = previewTheme;
_workContextAccessor = workContextAccessor;
_shapeHelperFactory = shapeHelperFactory;
}
public void OnResultExecuting(ResultExecutingContext filterContext) {
var baseViewModel = BaseViewModel.From(filterContext.Result);
if (baseViewModel == null)
return;
var previewThemeName = _previewTheme.GetPreviewTheme();
if (string.IsNullOrEmpty(previewThemeName))
return;
@@ -31,11 +31,11 @@ namespace Orchard.Themes.Preview {
Selected = theme.ThemeName == previewThemeName
})
};
baseViewModel.Zones.AddRenderPartial("body:before", "Admin/ThemePreview", model);
var shape = _shapeHelperFactory.CreateHelper();
_workContextAccessor.GetContext(filterContext).CurrentPage.Zones["Body"].Add(shape.ThemePreview(model), ":before");
}
public void OnResultExecuted(ResultExecutedContext filterContext) {
}
public void OnResultExecuted(ResultExecutedContext filterContext) {}
}
}

3
src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic;
using Orchard.Mvc.ViewModels;
namespace Orchard.Themes.ViewModels {
public class ThemesIndexViewModel : BaseViewModel {
public class ThemesIndexViewModel {
public ITheme CurrentTheme { get; set; }
public IEnumerable<ITheme> Themes { get; set; }
}

8
src/Orchard.Web/Modules/Orchard.Users/ViewModels/LogOnViewModel.cs
View File

@@ -1,7 +1,5 @@
using Orchard.Mvc.ViewModels;
namespace Orchard.Users.ViewModels {
public class LogOnViewModel : BaseViewModel {
namespace Orchard.Users.ViewModels {
public class LogOnViewModel {
public string Title { get; set; }
}
}
}

3
src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserCreateViewModel.cs
View File

@@ -1,10 +1,9 @@
using System.ComponentModel.DataAnnotations;
using Orchard.Mvc.ViewModels;
using Orchard.Security;
using Orchard.Users.Models;
namespace Orchard.Users.ViewModels {
public class UserCreateViewModel : BaseViewModel {
public class UserCreateViewModel {
[Required]
public string UserName { get; set; }

3
src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserEditViewModel.cs
View File

@@ -1,11 +1,10 @@
using System.ComponentModel.DataAnnotations;
using System.Web.Mvc;
using Orchard.ContentManagement;
using Orchard.Mvc.ViewModels;
using Orchard.Users.Models;
namespace Orchard.Users.ViewModels {
public class UserEditViewModel : BaseViewModel {
public class UserEditViewModel {
[HiddenInput(DisplayValue = false)]
public int Id {
get { return User.Item.Id; }

3
src/Orchard.Web/Modules/Orchard.Users/ViewModels/UsersIndexViewModel.cs
View File

@@ -1,10 +1,9 @@
using System.Collections.Generic;
using Orchard.Mvc.ViewModels;
using Orchard.Users.Models;
namespace Orchard.Users.ViewModels {
public class UsersIndexViewModel : BaseViewModel {
public class UsersIndexViewModel {
public class Row {
public UserPart UserPart { get; set; }
}