From 3e9c9971bffc54b37fac88ed63031b394aaee645 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 19 Jul 2010 14:45:24 -0700 Subject: [PATCH 1/3] Define category for Reports feature --HG-- branch : dev --- src/Orchard.Web/Core/Reports/Module.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Core/Reports/Module.txt b/src/Orchard.Web/Core/Reports/Module.txt index df4c0acbe..a5b66c3ae 100644 --- a/src/Orchard.Web/Core/Reports/Module.txt +++ b/src/Orchard.Web/Core/Reports/Module.txt @@ -6,6 +6,6 @@ version: 0.5.0 orchardversion: 0.5.0 description: The dashboard module is providing the reports screen of the application. features: - Dashboard: + Reports: Description: Reports management. Category: Core From 20b783c2aac93611d87f9fbbdca4d100bc169ced Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 19 Jul 2010 15:16:15 -0700 Subject: [PATCH 2/3] =?UTF-8?q?Enabling=20feature=20w/=20dependencies=20di?= =?UTF-8?q?dn=E2=80=99t=20work=20from=20command-line?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : dev --- .../Orchard.Modules/Commands/FeatureCommand.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Commands/FeatureCommand.cs b/src/Orchard.Web/Modules/Orchard.Modules/Commands/FeatureCommand.cs index 8f73ae78e..be6153170 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Commands/FeatureCommand.cs +++ b/src/Orchard.Web/Modules/Orchard.Modules/Commands/FeatureCommand.cs @@ -1,14 +1,17 @@ using System.Collections.Generic; using System.Linq; using Orchard.Commands; +using Orchard.UI.Notify; using Orchard.Utility.Extensions; namespace Orchard.Modules.Commands { public class FeatureCommand : DefaultOrchardCommandHandler { private readonly IModuleService _moduleService; + private readonly INotifier _notifier; - public FeatureCommand(IModuleService moduleService) { + public FeatureCommand(IModuleService moduleService, INotifier notifier) { _moduleService = moduleService; + _notifier = notifier; } [OrchardSwitch] @@ -59,8 +62,10 @@ namespace Orchard.Modules.Commands { } } if (featuresToEnable.Count != 0) { - _moduleService.EnableFeatures(featuresToEnable); - Context.Output.WriteLine(T("Enabled features {0}", string.Join(",", featuresToEnable))); + _moduleService.EnableFeatures(featuresToEnable, true); + foreach(var entry in _notifier.List()) { + Context.Output.WriteLine(entry.Message); + } } else { Context.Output.WriteLine(T("Could not enable features: {0}", string.Join(",", featureNames))); From 6df322030c2eadfad2afb77fd48ae34d6342b63c Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 19 Jul 2010 15:39:58 -0700 Subject: [PATCH 3/3] Changed default data migration version number to 1 --HG-- branch : dev --- .../Core/Common/DataMigrations/CommonDataMigration.cs | 2 +- .../Localization/DataMigrations/LocalizationDataMigration.cs | 2 +- .../Core/Navigation/DataMigrations/NavigationDataMigration.cs | 2 +- .../Core/Routable/DataMigrations/RoutableDataMigration.cs | 2 +- .../Core/Scheduling/DataMigrations/SchedulingDataMigration.cs | 2 +- .../Core/Settings/DataMigrations/SettingsDataMigration.cs | 2 +- .../Futures.Widgets/DataMigrations/WidgetsDataMigration.cs | 2 +- .../Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs | 2 +- .../Orchard.Comments/DataMigrations/CommentsDataMigration.cs | 2 +- .../Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt | 2 +- .../Orchard.Indexing/DataMigrations/IndexingDataMigration.cs | 2 +- .../Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs | 2 +- .../Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs | 2 +- .../Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs | 2 +- .../Orchard.Search/DataMigrations/SearchDataMigration.cs | 2 +- .../Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs | 2 +- .../Orchard.Themes/DataMigrations/ThemesDataMigration.cs | 2 +- .../Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs | 2 +- .../ContentManagement/DataMigrations/FrameworkDataMigration.cs | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs b/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs index beebe7f35..c6ef6606a 100644 --- a/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs +++ b/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs @@ -29,7 +29,7 @@ namespace Orchard.Core.Common.DataMigrations { .Column("ModifiedUtc") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs index baa4b9549..4cb268eb8 100644 --- a/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs +++ b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs @@ -11,7 +11,7 @@ namespace Orchard.Core.Localization.DataMigrations { .Column("MasterContentItemId") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs b/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs index 2b956d3e4..38dc25d0a 100644 --- a/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs +++ b/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs @@ -18,7 +18,7 @@ namespace Orchard.Core.Navigation.DataMigrations { .Column("OnMainMenu") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs b/src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs index 47544423d..a28b767ca 100644 --- a/src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs +++ b/src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs @@ -12,7 +12,7 @@ namespace Orchard.Core.Routable.DataMigrations { .Column("Path", column => column.WithLength(2048)) ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Scheduling/DataMigrations/SchedulingDataMigration.cs b/src/Orchard.Web/Core/Scheduling/DataMigrations/SchedulingDataMigration.cs index 08ce3354f..94a1c23d0 100644 --- a/src/Orchard.Web/Core/Scheduling/DataMigrations/SchedulingDataMigration.cs +++ b/src/Orchard.Web/Core/Scheduling/DataMigrations/SchedulingDataMigration.cs @@ -13,7 +13,7 @@ namespace Orchard.Core.Scheduling.DataMigrations { .Column("ContentItemVersionRecord_id") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs b/src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs index d8983dac4..019bd1f69 100644 --- a/src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs +++ b/src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs @@ -91,7 +91,7 @@ namespace Orchard.Core.Settings.DataMigrations { .Column("SiteCulture") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs b/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs index 35a9a8ac0..1aed639c3 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs +++ b/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs @@ -17,7 +17,7 @@ namespace Futures.Widgets.DataMigrations { .Column("Scope_id") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs index 89c79625e..530b4b886 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs @@ -20,7 +20,7 @@ namespace Orchard.Blogs.DataMigrations { .Column("PostCount") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs index e913042b7..3936f1f11 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs @@ -41,7 +41,7 @@ namespace Orchard.Comments.DataMigrations { .Column("CommentsActive") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt index 5755aeb18..007f91089 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt +++ b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt @@ -7,7 +7,7 @@ namespace $$FeatureName$$.DataMigrations { public int Create() { $$Commands$$ - return 0100; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs index 2456a66f1..2ff65cae4 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs @@ -12,7 +12,7 @@ namespace Orchard.Indexing.DataMigrations { .Column("ContentItemRecord_id") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs index 11b16fb3c..f7765fc26 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs @@ -10,7 +10,7 @@ namespace Orchard.Media.DataMigrations { .Column("RootMediaFolder") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs index ff7de13d3..af87885e5 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs @@ -33,7 +33,7 @@ namespace Orchard.Roles.DataMigrations { .Column("Role_id") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs index 95841485f..831e4a842 100644 --- a/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs @@ -14,7 +14,7 @@ namespace Orchard.Sandbox.DataMigrations { .Column("AllowAnonymousEdits") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs index fd77878cb..b897c5a96 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs @@ -11,7 +11,7 @@ namespace Orchard.Search.DataMigrations { .Column("SearchedFields") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs index f0b05a9ea..8deb3e699 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs @@ -17,7 +17,7 @@ namespace Orchard.Tags.DataMigrations { .Column("ContentItemId") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs index 5acbca541..03013b548 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs @@ -22,7 +22,7 @@ namespace Orchard.Themes.DataMigrations { .Column("CurrentThemeName") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs index c8a70afd6..b1e87bfb7 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs @@ -16,7 +16,7 @@ namespace Orchard.Users.DataMigrations { .Column("PasswordSalt") ); - return 0010; + return 1; } } } \ No newline at end of file diff --git a/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs b/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs index 9b5fd16bb..b1dcca7ed 100644 --- a/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs +++ b/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs @@ -33,7 +33,7 @@ namespace Orchard.ContentManagement.DataMigrations { .Column("Culture") ); - return 0010; + return 1; } } } \ No newline at end of file