From b2112a79f6d05cbd55435bb91f425be87f0c0032 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 2 Jun 2010 16:23:03 -0700 Subject: [PATCH 01/66] A bit of CSS cleanup and reorg --HG-- branch : dev --- .../Orchard.Blogs/Orchard.Blogs.csproj | 1 + .../Modules/Orchard.Blogs/Styles/admin.css | 3 + .../Items/Blogs.Blog.DetailAdmin.ascx | 4 +- .../Items/Blogs.Blog.SummaryAdmin.ascx | 4 +- .../Parts/Blogs.Blog.Manage.ascx | 1 + .../Orchard.Media/Orchard.Media.csproj | 1 + .../Modules/Orchard.Media/Styles/admin.css | 7 + .../Orchard.Media/Views/Admin/Add.aspx | 3 +- .../Orchard.Media/Views/Admin/Create.aspx | 3 +- .../Orchard.Media/Views/Admin/Edit.aspx | 3 +- .../Orchard.Media/Views/Admin/EditMedia.aspx | 3 +- .../Views/Admin/EditProperties.aspx | 3 +- .../Orchard.Pages/Orchard.Pages.csproj | 1 + .../Modules/Orchard.Pages/Styles/admin.css | 19 ++ .../Orchard.Pages/Views/Admin/List.aspx | 3 +- .../Orchard.Themes/Orchard.Themes.csproj | 1 + .../Modules/Orchard.Themes/Styles/admin.css | 38 +++ .../Orchard.Themes/Views/Admin/Index.aspx | 3 +- src/Orchard.Web/Themes/TheAdmin/Styles/ie.css | 8 +- .../Themes/TheAdmin/Styles/site.css | 316 +++++------------- 20 files changed, 177 insertions(+), 248 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css create mode 100644 src/Orchard.Web/Modules/Orchard.Media/Styles/admin.css create mode 100644 src/Orchard.Web/Modules/Orchard.Pages/Styles/admin.css create mode 100644 src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index ffe487a97..2df26fa98 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -122,6 +122,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css new file mode 100644 index 000000000..55925d659 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css @@ -0,0 +1,3 @@ +.blogdescription { + margin-top:1em; +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx index 921c4f0ac..9f5816d64 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx @@ -2,9 +2,7 @@ <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -

- <%=Html.TitleForPage(Model.Item.Name) %> -

+

<%=Html.TitleForPage(Model.Item.Name) %>

<% Html.Zone("manage"); %><%--
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx index 61f265c43..dbd222173 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx @@ -9,8 +9,8 @@ "><%=_Encoded("New Post") %><%=_Encoded(" | ")%> "><%=_Encoded("Settings") %><%=_Encoded(" | ")%> <%-- todo: (heskew) this is waaaaa too verbose. need template helpers for all ibuttons --%> - <% using (Html.BeginFormAntiForgeryPost(Url.BlogDelete(Model.Item.Slug), FormMethod.Post, new { @class = "inline" })) { %> - <% + <% using (Html.BeginFormAntiForgeryPost(Url.BlogDelete(Model.Item.Slug), FormMethod.Post, new { @class = "inline link" })) { %> + <% } %>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx index 8cb881754..2a158e1cd 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx @@ -2,6 +2,7 @@ <%@ Import Namespace="Orchard.Blogs"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%><% +Html.RegisterStyle("admin.css"); if (AuthorizedFor(Permissions.ManageBlogs)) { %>

<%=_Encoded("Edit") %>

diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj index 9c6082b22..88f02adab 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj +++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj @@ -93,6 +93,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Media/Styles/admin.css new file mode 100644 index 000000000..3efdaf0de --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Media/Styles/admin.css @@ -0,0 +1,7 @@ +.breadCrumbs, .folderProperties { + float:left; + margin:-2em 0 0; +} +.folderProperties { + float:right; +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx index 1fb37f2ff..3a48de13c 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx @@ -1,7 +1,8 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Helpers"%> <%@ Import Namespace="Orchard.Media.Models"%> -<%@ Import Namespace="Orchard.Media.ViewModels"%> +<%@ Import Namespace="Orchard.Media.ViewModels"%><% +Html.RegisterStyle("admin.css"); %>

<%=Html.TitleForPage(T("Add Media").ToString()) %>

<%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> > diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx index 60dcd8fb4..c834a45e8 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx @@ -1,7 +1,8 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Helpers"%> <%@ Import Namespace="Orchard.Media.Models"%> -<%@ Import Namespace="Orchard.Media.ViewModels"%> +<%@ Import Namespace="Orchard.Media.ViewModels"%><% +Html.RegisterStyle("admin.css"); %>

<%=Html.TitleForPage(T("Add a Folder").ToString()) %>

<%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> > diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx index cd02356b8..bc637cfcb 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx @@ -1,7 +1,8 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Models"%> <%@ Import Namespace="Orchard.Media.Helpers"%> -<%@ Import Namespace="Orchard.Media.ViewModels"%> +<%@ Import Namespace="Orchard.Media.ViewModels"%><% +Html.RegisterStyle("admin.css"); %>

<%=Html.TitleForPage(T("Manage Folder").ToString())%>

diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx index 0d5554e77..f85f54add 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx @@ -1,7 +1,8 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Models"%> <%@ Import Namespace="Orchard.Media.Helpers"%> -<%@ Import Namespace="Orchard.Media.ViewModels"%> +<%@ Import Namespace="Orchard.Media.ViewModels"%><% +Html.RegisterStyle("admin.css"); %>

<%=Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())%>

diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx index 3741a936d..6419e734e 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx @@ -1,7 +1,8 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Media.Helpers"%> <%@ Import Namespace="Orchard.Media.Models"%> -<%@ Import Namespace="Orchard.Media.ViewModels"%> +<%@ Import Namespace="Orchard.Media.ViewModels"%><% +Html.RegisterStyle("admin.css"); %>

<%=Html.TitleForPage(T("Folder Properties").ToString())%>

<%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> > diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj index 301406985..85af20843 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj +++ b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj @@ -93,6 +93,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Pages/Styles/admin.css new file mode 100644 index 000000000..5504fdc34 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Pages/Styles/admin.css @@ -0,0 +1,19 @@ +.pageList { + margin:0; + padding:0; + /*background:#FFFFFF url(images/backgroundGradient.gif) repeat-x scroll left top;*/ +} +.orchard-pages .contentItems { + margin:.5em 0 0; + padding:0; + } +.contentItems .properties ul { + margin:0.8em 0 0 2em; +} +.contentItems .properties ul li { + margin:0; + padding:0 0 .1em 0; +} +.properties h3 { + display:inline; +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx index 6fb3f2092..493ee7f03 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx +++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx @@ -3,7 +3,8 @@ <%@ Import Namespace="Orchard.ContentManagement"%> <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Mvc.Html"%> -<%@ Import Namespace="Orchard.Pages.ViewModels"%> +<%@ Import Namespace="Orchard.Pages.ViewModels"%><% +Html.RegisterStyle("admin.css"); %>

<%=Html.TitleForPage(T("Manage Pages").ToString())%>

<%-- todo: Add helper text here when ready.

<%=_Encoded("Possible text about setting up a page goes here.")%>

--%>
<%=Html.ActionLink(T("Add a page").ToString(), "Create", new { }, new { @class = "button primaryAction" })%>
<% diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj index d5cfcd5ff..2d78f2c16 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj @@ -88,6 +88,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css new file mode 100644 index 000000000..362db6edd --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css @@ -0,0 +1,38 @@ +#main .templates p { + margin:0 0 .3em 0; +} +.templates li { + margin:.8em; + width:30%; + display: -moz-inline-stack; + display:inline-block; + vertical-align:top; + zoom:1; + *display: inline; +} +.templates .inline button { + font-size:1.2em; +} +.templates .wasFormInlineLink { + font-size:1.4em; +} +.templates p { + overflow:hidden; +} +.templates img, .themePreviewImage { + border:1px solid #e8e8e8; + height:200px; + margin:.27em 0 .93em 0; + display:block; +} +.previewImage { + border:1px solid #525e50; + height:50%; + width:50%; +} +.themes #main h2 { + margin:1em 0 0 0; +} +.themePreviewImage { + height:300px; +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx index 618845880..01777af66 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx @@ -1,6 +1,7 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Mvc.Html"%> -<%@ Import Namespace="Orchard.Themes.ViewModels"%> +<%@ Import Namespace="Orchard.Themes.ViewModels"%><% + Html.RegisterStyle("admin.css"); %>

<%=Html.TitleForPage(T("Manage Themes").ToString()) %>

<% if (Model.CurrentTheme == null) { %>

<%=_Encoded("There is no current theme in the application. The built-in theme will be used.") diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/ie.css b/src/Orchard.Web/Themes/TheAdmin/Styles/ie.css index 5f282702b..b07efeb2b 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/ie.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/ie.css @@ -1 +1,7 @@ - \ No newline at end of file +.contentItems { + /* need an alternative to: + box-shadow:inset 0 1px 2px #878686; + -moz-box-shadow:inset 0 1px 3px #878686; + -webkit-box-shadow:inset 0 1px 2px #878686; + */ +} \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 00ff2c9c7..59cb915bd 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -40,7 +40,6 @@ table { } /* end: reset */ - /* Base setup ----------------------------------------------------------*/ html { @@ -56,7 +55,6 @@ body { min-width:94.6em; /* 946px */ padding:0; } -/*todo: (heskew) find out why I need this...*/ button { font-family:Segoe UI,Trebuchet,Arial,Sans-Serif; font-size:1.01em; @@ -68,7 +66,6 @@ body#preview { background:#fcfcfc; } - /* Layout number of columns: 24; actual width: 946; column width: 26; gutter width:14 @@ -232,7 +229,6 @@ form.link button:hover { color:#ffea9b; } - /* Navigation ----------------------------------------------------------*/ #navshortcut { @@ -276,7 +272,6 @@ form.link button:hover { text-decoration:underline; } - /* Content ----------------------------------------------------------*/ #main h1 { @@ -325,7 +320,6 @@ span.message { .message a { font-weight:bold; } - .confirmation.message { background:#D1F2A5; /* green */ border:1px solid #BCD994; @@ -358,7 +352,6 @@ span.message { content:"DEBUG » "; } - /* Forms ----------------------------------------------------------*/ form.inline, form.inline fieldset { /* todo: (heskew) need something other than .inline ... */ @@ -381,7 +374,7 @@ legend span { font-weight:normal; } label { - display: block; + display:block; color:#4c4c4c; font-weight:bold; } @@ -401,9 +394,6 @@ label input { .hint { display:block; } -.hint.forcheckbox { - text-indent:3ex; /* todo: (heskew) this might look out of place */ -} /* todo: (heskew) try to get .text on stuff like .text-box */ select, textarea, input.text, input.textMedium, input.text-box { padding:2px; @@ -422,18 +412,6 @@ input.check-box { margin-left:0; vertical-align:-.1em; } -.permalink input { - background:transparent; - border-color:#EAE9D9; - border-style:dashed; - margin-left:0; - width:350px; -} -.permalink input:focus { - background:#FFF; - border-color:#666d51; - border-style:solid; -} input.large.text, textarea, fieldset { clear:both; } @@ -441,21 +419,6 @@ fieldset { margin:0 0 1.3em 0; padding:6px 0 0; } -/* Settings page styles */ -.settings fieldset { - margin:.5em 0; - padding:1em; -} -.orchard-media fieldset div, .settings fieldset div, .orchard-media .button, .settings .button { - margin:1em 0 .5em 1em; -} -.settings legend { - margin:0 0 -.4em 0; -} -/* todo: This style is the same as textMedium. Consolidate if possible */ -.settings input.text, .settings input.text-box { - width:26em; -} textarea { min-height:8em; } @@ -542,9 +505,8 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner { overflow:hidden; } .actions { - height:2em; - overflow:hidden; - padding:.6em 0 .1em; + clear:right; + padding:0; text-align:right; } .contentItems .actions li { @@ -608,58 +570,6 @@ button.ibutton { .ibutton.blog:hover, .ibutton.blog:active, .ibutton.blog:focus { background-position:-120px 0; } -/* todo: (heskew) needs attention */ -.withActions { - overflow:hidden; -} -.withActions a { - display:inline; - float:left; - margin-right:7px; -} - - -/* Content item lists -----------------------------------------------------------*/ -.contentItems { - background:#FFF; - box-shadow:inset 0 1px 2px #878686; - -moz-box-shadow:inset 0 1px 3px #878686; - -webkit-box-shadow:inset 0 1px 2px #878686; - margin:1.4em 0; - padding:2px; -} -.contentItems li { - border-bottom:1px solid #eaeaea; - margin:0; - overflow:hidden; - padding:0 1.4em .8em; -} -.contentItems li.last { - border-bottom:0; -} -#main .contentItems li .actions { - color:#EAE9D9; - height:auto; - margin:-1.3em 0 0; - padding:0 0 .1em; -} -#main .contentItems li .actions .ibutton { - margin-right:6px; -} -#main .contentItems li .actions .destruct .ibutton { - margin-left:8px; - margin-right:0; -} -#main .contentItems li:hover .ibutton { background-position:0 0; } -#main .contentItems li:hover .ibutton.remove { background-position:-20px 0; } -#main .contentItems li:hover .ibutton.view { background-position:-40px 0; } -#main .contentItems li:hover .ibutton.add.page { background-position:-60px 0; } -#main .contentItems li:hover .ibutton.edit { background-position:-80px 0; } -#main .contentItems li:hover .ibutton.publish { background-position:-100px 0; } -#main .contentItems li:hover .ibutton.blog { background-position:-120px 0; } - - /* (Items) Tables ----------------------------------------------------------*/ table.items { @@ -715,170 +625,106 @@ table .button { } -/* MISC. -todo: (heskew) pull out into relevant modules where appropriate +/* Content item lists ----------------------------------------------------------*/ - -/* Pages -----------------------------------------------------------*/ -#main .templates p { - margin:0 0 .3em 0; +.contentItems { + background:#FFF; + box-shadow:inset 0 1px 2px #878686; + -moz-box-shadow:inset 0 1px 3px #878686; + -webkit-box-shadow:inset 0 1px 2px #878686; + clear:both; + margin:1.4em 0; } -.templates li { - margin:.8em; - width:30%; - display: -moz-inline-stack; - display:inline-block; - vertical-align:top; - zoom:1; - *display: inline; -} -.templates .inline button { - font-size:1.2em; -} -.templates .wasFormInlineLink { - font-size:1.4em; -} -.templates p { +.contentItems li { + border-bottom:1px solid #eaeaea; + margin:0; overflow:hidden; + padding:0 1.4em .8em; } -.templates img, .themePreviewImage { - border:1px solid #e8e8e8; - height:200px; - margin:.27em 0 .93em 0; - display:block; +.contentItems li.last { + border-bottom:0; } -.previewImage { - border:1px solid #525e50; - height:50%; - width:50%; +#main .contentItems li .actions { + color:#EAE9D9; + height:auto; + margin:-1.3em 0 0; + padding:0 0 .1em; } -.themes #main h2 { - margin:1em 0 0 0; +#main .contentItems li .actions .ibutton { + margin-right:6px; } -.themePreviewImage { - height:300px; +#main .contentItems li .actions .destruct .ibutton { + margin-left:8px; + margin-right:0; } +#main .contentItems li:hover .ibutton { background-position:0 0; } +#main .contentItems li:hover .ibutton.remove { background-position:-20px 0; } +#main .contentItems li:hover .ibutton.view { background-position:-40px 0; } +#main .contentItems li:hover .ibutton.add.page { background-position:-60px 0; } +#main .contentItems li:hover .ibutton.edit { background-position:-80px 0; } +#main .contentItems li:hover .ibutton.publish { background-position:-100px 0; } +#main .contentItems li:hover .ibutton.blog { background-position:-120px 0; } -/* Rounded borders and other "works in some browsers" additions ----------------------------------------------------------- -#content, #navigation li, button, .button, -table.items, textarea, input.text, input.text-box, -.contentItems, .message, .validation-summary-errors { - -moz-border-radius:4px; - -webkit-border-radius:4px; - border-radius:4px; -} -#navigation li h4 a { - -moz-border-radius:3px 3px 0 0; - -webkit-border-radius:3px 3px 0 0; - border-radius:3px 3px 0 0; -}*/ - - - -/* Added classes for new blog list layout ----------------------------------------------------------- */ -.blogdescription { - margin-top:1em; -} -.summary { +.contentItems .summary { overflow:auto; padding:1.2em .4em; } -.actions { - clear:right; - height:auto; - overflow:visible; - padding:0; - text-align:right; -} -.contentItems { - clear:both; - padding:0; -} -.properties { +.contentItems .properties { float:left; } -.blogs.contentItems .properties { - float:none; -} -#main .contentItems .properties h3 { - border-bottom:none; - margin:0; - padding:0; -} -.related{ - font-size:1.4em; - float:right; - text-align:right; -} -/*todo: (heskew) cleanup */ -.related .button { - font-size:1em; -} -/*end todo*/ -.commentcount { - line-height:2em; -} -.contentItems .properties ul li{ +.contentItems .properties li { border:0; float:left; - padding:.8em 0; font-size:1.4em; - background:inherit; + padding:.8em 0; } -.icon { - margin:0 .2em -.2em .2em; +.contentItems .properties .icon { + margin:0 .2em -.2em; } -h3 .icon { - margin-bottom:-.05em; -} -.linkButton { - border:none; - padding:0; - background:none; - color:#1E5D7D; - } -.linkButton:hover { - background-color:Transparent; - text-decoration:underline; - color:#1E5D7D; - } - - /* Added classes for new page list layout ----------------------------------------------------------- */ -.pageList { - margin:0; - padding:0; - /*background:#FFFFFF url(images/backgroundGradient.gif) repeat-x scroll left top;*/ - } -.orchard-pages .contentItems { - margin:.5em 0 0; - padding:0; - } -.contentItems .properties ul.pageStatus { - margin:0.8em 0 0 2em; -} -.contentItems .properties ul.pageStatus li { - margin:0; - padding:0 0 .1em 0; -} -.properties h3 { - display:inline; -} - -/* Added classes for media ----------------------------------------------------------- */ -.breadCrumbs, .folderProperties { - float:left; - margin:-2em 0 0 0; -} -.folderProperties { +.contentItems .related{ float:right; + font-size:1.4em; + text-align:right; +} +.contentItems .commentcount { + line-height:2em; } -/* ---------- Generic ---------- */ + +/* Core Modules +----------------------------------------------------------*/ +/* Routable */ +.permalink input { + background:transparent; + border-color:#EAE9D9; + border-style:dashed; + margin-left:0; + width:350px; +} +.permalink input:focus { + background:#FFF; + border-color:#666d51; + border-style:solid; +} +/* Settings */ +.settings fieldset { + margin:.5em 0; + padding:1em; +} +.orchard-media fieldset div, .settings fieldset div, .orchard-media .button, .settings .button { + margin:1em 0 .5em 1em; +} +.settings legend { + margin:0 0 -.4em 0; +} +/* todo: This style is the same as textMedium. Consolidate if possible */ +.settings input.text, .settings input.text-box { + width:26em; +} + + +/* ---------- Generic ---------- */ +/* todo: needed? */ .clearBoth { clear:both; } \ No newline at end of file From d48d82299083f71b9566dc0914b7d2cd458bb136 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Wed, 2 Jun 2010 17:32:58 -0700 Subject: [PATCH 02/66] Fix bug in shell state computation --HG-- branch : dev --- src/Orchard/Environment/State/ShellStateCoordinator.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard/Environment/State/ShellStateCoordinator.cs b/src/Orchard/Environment/State/ShellStateCoordinator.cs index 1ef1d1854..3d408998f 100644 --- a/src/Orchard/Environment/State/ShellStateCoordinator.cs +++ b/src/Orchard/Environment/State/ShellStateCoordinator.cs @@ -148,13 +148,13 @@ namespace Orchard.Environment.State { })); // lower enabled states in reverse order - foreach (var entry in allEntries.Where(entry => entry.FeatureState.EnableState == ShellFeatureState.State.Falling)) { + foreach (var entry in allEntries.Reverse().Where(entry => entry.FeatureState.EnableState == ShellFeatureState.State.Falling)) { _featureEvents.Disable(entry.Feature); _stateManager.UpdateEnabledState(entry.FeatureState, ShellFeatureState.State.Down); } // lower installed states in reverse order - foreach (var entry in allEntries.Where(entry => entry.FeatureState.InstallState == ShellFeatureState.State.Falling)) { + foreach (var entry in allEntries.Reverse().Where(entry => entry.FeatureState.InstallState == ShellFeatureState.State.Falling)) { _featureEvents.Uninstall(entry.Feature); _stateManager.UpdateInstalledState(entry.FeatureState, ShellFeatureState.State.Down); } From 0fb6ece9a9d022af5db9cd7f305e8bcc1391afd1 Mon Sep 17 00:00:00 2001 From: Jonathan Wall Date: Thu, 3 Jun 2010 10:20:40 -0700 Subject: [PATCH 03/66] Added drop shadows to manage features page. --HG-- branch : dev --- src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css b/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css index 7804ea223..8aada2d0f 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css +++ b/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css @@ -1,6 +1,9 @@ #main .features h2 { margin-top:0; } +#main .features h3 { + padding:0; +} .features.detail-view .category > ul { border:1px solid #EAEAEA; margin-bottom:2em; @@ -11,6 +14,9 @@ } .features.summary-view .feature { border:1px solid #EAEAEA; + box-shadow: 0px 1px 2px #d6d6d6; + -moz-box-shadow: 0px 1px 2px #d6d6d6; + -webkit-box-shadow: 0px 1px 2px #d6d6d6; display:block; float:left; height:5em; From 78d57598817aed984bb82e3b687690b9e088e925 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Thu, 3 Jun 2010 11:33:16 -0700 Subject: [PATCH 04/66] - po file merging from various locations. --HG-- branch : dev --- .../Services/DefaultResourceManager.cs | 62 ++++++++++++++++--- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/src/Orchard/Localization/Services/DefaultResourceManager.cs b/src/Orchard/Localization/Services/DefaultResourceManager.cs index 313de4212..9b56f3c8c 100644 --- a/src/Orchard/Localization/Services/DefaultResourceManager.cs +++ b/src/Orchard/Localization/Services/DefaultResourceManager.cs @@ -1,18 +1,31 @@ using System; using System.Collections.Generic; using System.IO; +using Orchard.Environment.Configuration; +using Orchard.Environment.Extensions; using Orchard.FileSystems.WebSite; namespace Orchard.Localization.Services { public class DefaultResourceManager : IResourceManager { private readonly IWebSiteFolder _webSiteFolder; private readonly ICultureManager _cultureManager; + private readonly IExtensionManager _extensionManager; + private readonly ShellSettings _shellSettings; private readonly IList _cultures; const string CoreLocalizationFilePathFormat = "/Core/App_Data/Localization/{0}/orchard.core.po"; + const string ModulesLocalizationFilePathFormat = "/Modules/{0}/App_Data/Localization/{1}/orchard.module.po"; + const string RootLocalizationFilePathFormat = "/App_Data/Localization/{0}/orchard.root.po"; + const string TenantLocalizationFilePathFormat = "/App_Data/Sites/{0}/Localization/{1}/orchard.po"; - public DefaultResourceManager(ICultureManager cultureManager, IWebSiteFolder webSiteFolder) { + public DefaultResourceManager( + ICultureManager cultureManager, + IWebSiteFolder webSiteFolder, + IExtensionManager extensionManager, + ShellSettings shellSettings) { _cultureManager = cultureManager; _webSiteFolder = webSiteFolder; + _extensionManager = extensionManager; + _shellSettings = shellSettings; _cultures = new List(); } @@ -48,16 +61,39 @@ namespace Orchard.Localization.Services { } private IDictionary LoadTranslationsForCulture(string culture) { - string path = string.Format(CoreLocalizationFilePathFormat, culture); - string text = _webSiteFolder.ReadFile(path); + IDictionary translations = new Dictionary(); + string corePath = string.Format(CoreLocalizationFilePathFormat, culture); + string text = _webSiteFolder.ReadFile(corePath); if (text != null) { - return ParseLocalizationStream(text); + ParseLocalizationStream(text, translations, false); } - return new Dictionary(); + + foreach (var module in _extensionManager.AvailableExtensions()) { + if (String.Equals(module.ExtensionType, "Module")) { + string modulePath = string.Format(ModulesLocalizationFilePathFormat, module.Name, culture); + text = _webSiteFolder.ReadFile(modulePath); + if (text != null) { + ParseLocalizationStream(text, translations, true); + } + } + } + + string rootPath = string.Format(RootLocalizationFilePathFormat, culture); + text = _webSiteFolder.ReadFile(rootPath); + if (text != null) { + ParseLocalizationStream(text, translations, true); + } + + string tenantPath = string.Format(TenantLocalizationFilePathFormat, _shellSettings.Name, culture); + text = _webSiteFolder.ReadFile(tenantPath); + if (text != null) { + ParseLocalizationStream(text, translations, true); + } + + return translations; } - private static IDictionary ParseLocalizationStream(string text) { - Dictionary translations = new Dictionary(); + private static void ParseLocalizationStream(string text, IDictionary translations, bool merge) { StringReader reader = new StringReader(text); string poLine, id, scope; id = scope = String.Empty; @@ -80,18 +116,26 @@ namespace Orchard.Localization.Services { if (!translations.ContainsKey(scopedKey)) { translations.Add(scopedKey, translation); } + else { + if (merge) { + translations[scopedKey] = translation; + } + } } string genericKey = "|" + id; if (!translations.ContainsKey(genericKey)) { translations.Add(genericKey, translation); } + else { + if (merge) { + translations[genericKey] = translation; + } + } } id = scope = String.Empty; } } - - return translations; } private static string ParseTranslation(string poLine) { From c677737a0dc323695125dba2d14fb35e71be826e Mon Sep 17 00:00:00 2001 From: Suha Can Date: Thu, 3 Jun 2010 12:48:26 -0700 Subject: [PATCH 05/66] - culture fallback to parent/neutral when resolving localized strings. --HG-- branch : dev --- .../Services/DefaultResourceManager.cs | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/Orchard/Localization/Services/DefaultResourceManager.cs b/src/Orchard/Localization/Services/DefaultResourceManager.cs index 9b56f3c8c..aa6fa3482 100644 --- a/src/Orchard/Localization/Services/DefaultResourceManager.cs +++ b/src/Orchard/Localization/Services/DefaultResourceManager.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using Orchard.Environment.Configuration; using Orchard.Environment.Extensions; @@ -44,13 +45,39 @@ namespace Orchard.Localization.Services { if (culture.Translations.ContainsKey(genericKey)) { return culture.Translations[genericKey]; } - return text; + + return GetParentTranslation(scope, text, cultureName); } } return text; } + private string GetParentTranslation(string scope, string text, string cultureName) { + string scopedKey = scope + "|" + text; + string genericKey = "|" + text; + try { + CultureInfo cultureInfo = CultureInfo.GetCultureInfo(cultureName); + CultureInfo parentCultureInfo = cultureInfo.Parent; + if (parentCultureInfo.IsNeutralCulture) { + foreach (var culture in _cultures) { + if (String.Equals(parentCultureInfo.Name, culture.CultureName, StringComparison.OrdinalIgnoreCase)) { + if (culture.Translations.ContainsKey(scopedKey)) { + return culture.Translations[scopedKey]; + } + if (culture.Translations.ContainsKey(genericKey)) { + return culture.Translations[genericKey]; + } + break; + } + } + } + } + catch (CultureNotFoundException) { } + + return text; + } + private void LoadCultures() { foreach (var culture in _cultureManager.ListCultures()) { _cultures.Add(new CultureDictionary { From bf665f71c4977e8c68de4b42d7080c87d0dbc7ef Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 3 Jun 2010 13:12:07 -0700 Subject: [PATCH 06/66] Background indexing tasks can now delete existing indexes Added new column to store the action type (update, delete) Added new overloads to handle multiple indexing actions in the same transaction --HG-- branch : dev --- .../Indexing/DefaultIndexProviderTests.cs | 13 ++++ .../Indexing/Lucene/DefaultIndexDocument.cs | 5 ++ .../Indexing/Lucene/DefaultIndexProvider.cs | 66 ++++++++++++------ .../Indexing/Models/IndexingTaskRecord.cs | 5 ++ .../Services/CreateIndexingTaskHandler.cs | 4 +- .../Indexing/Services/IndexingTaskExecutor.cs | 67 ++++++++++++++----- .../Indexing/Services/IndexingTaskManager.cs | 26 +++++-- src/Orchard/Indexing/IIndexProvider.cs | 21 ++++-- .../Tasks/Indexing/IIndexingTaskManager.cs | 23 ++++++- src/Orchard/Tasks/SweepGenerator.cs | 2 +- 10 files changed, 177 insertions(+), 55 deletions(-) diff --git a/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs b/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs index 953853e88..443f8dad6 100644 --- a/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs +++ b/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs @@ -168,5 +168,18 @@ namespace Orchard.Tests.Indexing { Assert.That(searchBuilder.WithField("body", "hr").Search().Count(), Is.EqualTo(1)); Assert.That(searchBuilder.WithField("body", "hr").Search().First().Id, Is.EqualTo(1)); } + + [Test] public void ShouldAllowNullOrEmptyStrings() { + _provider.CreateIndex("default"); + _provider.Store("default", _provider.New(1).Add("body", null)); + _provider.Store("default", _provider.New(2).Add("body", "")); + _provider.Store("default", _provider.New(3).Add("body", "

", true)); + + var searchBuilder = _provider.CreateSearchBuilder("default"); + + Assert.That(searchBuilder.Get(1).Id, Is.EqualTo(1)); + Assert.That(searchBuilder.Get(2).Id, Is.EqualTo(2)); + Assert.That(searchBuilder.Get(3).Id, Is.EqualTo(3)); + } } } diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexDocument.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexDocument.cs index 8c10ff43b..02eae5b1c 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexDocument.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexDocument.cs @@ -25,6 +25,11 @@ namespace Orchard.Core.Indexing.Lucene { public IIndexDocument Add(string name, string value, bool removeTags) { AppendPreviousField(); + + if(value == null) { + value = String.Empty; + } + if(removeTags) { value = value.RemoveTags(); } diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs index d7df669a5..9a5e01174 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using System.IO; +using System.Linq; using Lucene.Net.Analysis; using Lucene.Net.Analysis.Standard; using Lucene.Net.Documents; @@ -14,7 +16,7 @@ using Orchard.Logging; namespace Orchard.Core.Indexing.Lucene { /// - /// Represents the default implementation of an IIndexProvider based on Lucene + /// Represents the default implementation of an IIndexProvider, based on Lucene /// public class DefaultIndexProvider : IIndexProvider { private readonly IAppDataFolder _appDataFolder; @@ -73,40 +75,65 @@ namespace Orchard.Core.Indexing.Lucene { } public void Store(string indexName, IIndexDocument indexDocument) { - Store(indexName, (DefaultIndexDocument)indexDocument); + Store(indexName, new [] { (DefaultIndexDocument)indexDocument }); } - public void Store(string indexName, DefaultIndexDocument indexDocument) { + public void Store(string indexName, IEnumerable indexDocuments) { + Store(indexName, indexDocuments.Cast()); + } + + public void Store(string indexName, IEnumerable indexDocuments) { + if(indexDocuments.AsQueryable().Count() == 0) { + return; + } + var writer = new IndexWriter(GetDirectory(indexName), _analyzer, false, IndexWriter.MaxFieldLength.UNLIMITED); + DefaultIndexDocument current = null; try { - var doc = CreateDocument(indexDocument); - writer.AddDocument(doc); - Logger.Debug("Document [{0}] indexed", indexDocument.Id); + foreach ( var indexDocument in indexDocuments ) { + current = indexDocument; + var doc = CreateDocument(indexDocument); + writer.AddDocument(doc); + Logger.Debug("Document [{0}] indexed", indexDocument.Id); + } } catch ( Exception ex ) { - Logger.Error(ex, "An unexpected error occured while removing the document [{0}] from the index [{1}].", indexDocument.Id, indexName); + Logger.Error(ex, "An unexpected error occured while add the document [{0}] from the index [{1}].", current.Id, indexName); } finally { + writer.Optimize(); writer.Close(); } } - public void Delete(string indexName, int id) { - var reader = IndexReader.Open(GetDirectory(indexName), false); + public void Delete(string indexName, int documentId) { + Delete(indexName, new[] { documentId }); + } + + public void Delete(string indexName, IEnumerable documentIds) { + if ( documentIds.AsQueryable().Count() == 0 ) { + return; + } + + var reader = IndexReader.Open(GetDirectory(indexName), false); try { - var term = new Term("id", id.ToString()); - if ( reader.DeleteDocuments(term) != 0 ) { - Logger.Error("The document [{0}] could not be removed from the index [{1}]", id, indexName); + foreach (var id in documentIds) { + try { + var term = new Term("id", id.ToString()); + if (reader.DeleteDocuments(term) != 0) { + Logger.Error("The document [{0}] could not be removed from the index [{1}]", id, indexName); + } + else { + Logger.Debug("Document [{0}] removed from index", id); + } + } + catch (Exception ex) { + Logger.Error(ex, "An unexpected error occured while removing the document [{0}] from the index [{1}].", id, indexName); + } } - else { - Logger.Debug("Document [{0}] removed from index", id); - } - } - catch ( Exception ex ) { - Logger.Error(ex, "An unexpected error occured while removing the document [{0}] from the index [{1}].", id, indexName); } finally { reader.Close(); @@ -121,8 +148,5 @@ namespace Orchard.Core.Indexing.Lucene { return new DefaultSearchBuilder(GetDirectory(indexName)); } - public IIndexDocument Get(string indexName, int id) { - throw new NotImplementedException(); - } } } diff --git a/src/Orchard.Web/Core/Indexing/Models/IndexingTaskRecord.cs b/src/Orchard.Web/Core/Indexing/Models/IndexingTaskRecord.cs index e0bb9f54b..3cab96601 100644 --- a/src/Orchard.Web/Core/Indexing/Models/IndexingTaskRecord.cs +++ b/src/Orchard.Web/Core/Indexing/Models/IndexingTaskRecord.cs @@ -3,7 +3,12 @@ using Orchard.ContentManagement.Records; namespace Orchard.Core.Indexing.Models { public class IndexingTaskRecord { + + public const int Update = 0; + public const int Delete = 1; + public virtual int Id { get; set; } + public virtual int Action { get; set; } public virtual DateTime? CreatedUtc { get; set; } public virtual ContentItemRecord ContentItemRecord { get; set; } } diff --git a/src/Orchard.Web/Core/Indexing/Services/CreateIndexingTaskHandler.cs b/src/Orchard.Web/Core/Indexing/Services/CreateIndexingTaskHandler.cs index 7924afb75..4da37eddc 100644 --- a/src/Orchard.Web/Core/Indexing/Services/CreateIndexingTaskHandler.cs +++ b/src/Orchard.Web/Core/Indexing/Services/CreateIndexingTaskHandler.cs @@ -19,11 +19,11 @@ namespace Orchard.Core.Indexing.Services { } void CreateIndexingTask(PublishContentContext context, ContentPart part) { - _indexingTaskManager.CreateTask(context.ContentItem); + _indexingTaskManager.CreateUpdateIndexTask(context.ContentItem); } void RemoveIndexingTask(RemoveContentContext context, ContentPart part) { - _indexingTaskManager.DeleteTasks(context.ContentItem); + _indexingTaskManager.CreateDeleteIndexTask(context.ContentItem); } } diff --git a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs index 7fa3d8a6c..1b4d53035 100644 --- a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs +++ b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs @@ -22,9 +22,9 @@ namespace Orchard.Core.Indexing.Services { private readonly IRepository _settings; private readonly IEnumerable _handlers; private IIndexProvider _indexProvider; - private IIndexManager _indexManager; + private readonly IIndexManager _indexManager; private readonly IContentManager _contentManager; - private const string SearchIndexName = "search"; + private const string SearchIndexName = "Search"; public IndexingTaskExecutor( IClock clock, @@ -46,7 +46,7 @@ namespace Orchard.Core.Indexing.Services { public void Sweep() { - if(!_indexManager.HasIndexProvider()) { + if ( !_indexManager.HasIndexProvider() ) { return; } @@ -55,8 +55,8 @@ namespace Orchard.Core.Indexing.Services { // retrieve last processed index time var settingsRecord = _settings.Table.FirstOrDefault(); - if (settingsRecord == null) { - _settings.Create(settingsRecord = new IndexingSettingsRecord { LatestIndexingUtc = new DateTime(1980, 1, 1)}); + if ( settingsRecord == null ) { + _settings.Create(settingsRecord = new IndexingSettingsRecord { LatestIndexingUtc = new DateTime(1980, 1, 1) }); } var lastIndexing = settingsRecord.LatestIndexingUtc; @@ -65,41 +65,76 @@ namespace Orchard.Core.Indexing.Services { // retrieved not yet processed tasks var taskRecords = _repository.Fetch(x => x.CreatedUtc >= lastIndexing) .ToArray(); - - if (taskRecords.Length == 0) + + if ( taskRecords.Length == 0 ) return; Logger.Information("Processing {0} indexing tasks", taskRecords.Length); - - if(!_indexProvider.Exists(SearchIndexName)) { + + if ( !_indexProvider.Exists(SearchIndexName) ) { _indexProvider.CreateIndex(SearchIndexName); } - foreach (var taskRecord in taskRecords) { + var updateIndexDocuments = new List(); + var deleteIndexDocuments = new List(); + + // process Delete tasks + foreach ( var taskRecord in taskRecords.Where(t => t.Action == IndexingTaskRecord.Delete) ) { + var task = new IndexingTask(_contentManager, taskRecord); + deleteIndexDocuments.Add(taskRecord.ContentItemRecord.Id); + + try { + _repository.Delete(taskRecord); + } + catch ( Exception ex ) { + Logger.Error(ex, "Could not delete task #{0}", taskRecord.Id); + } + } + + + try { + if ( deleteIndexDocuments.Count > 0 ) { + _indexProvider.Delete(SearchIndexName, deleteIndexDocuments); + } + } + catch ( Exception ex ) { + Logger.Warning(ex, "An error occured while remove a document from the index"); + } + + // process Update tasks + foreach ( var taskRecord in taskRecords.Where(t => t.Action == IndexingTaskRecord.Update) ) { + var task = new IndexingTask(_contentManager, taskRecord); try { - var task = new IndexingTask(_contentManager, taskRecord); var context = new IndexContentContext { - ContentItem = task.ContentItem, - IndexDocument = _indexProvider.New(task.ContentItem.Id) + ContentItem = task.ContentItem, + IndexDocument = _indexProvider.New(task.ContentItem.Id) }; // dispatch to handlers to retrieve index information - foreach (var handler in _handlers) { + foreach ( var handler in _handlers ) { handler.Indexing(context); } - _indexProvider.Store(SearchIndexName, context.IndexDocument); + updateIndexDocuments.Add(context.IndexDocument); foreach ( var handler in _handlers ) { handler.Indexed(context); } } - catch (Exception ex) { + catch ( Exception ex ) { Logger.Warning(ex, "Unable to process indexing task #{0}", taskRecord.Id); } + } + try { + if ( updateIndexDocuments.Count > 0 ) { + _indexProvider.Store(SearchIndexName, updateIndexDocuments); + } + } + catch ( Exception ex ) { + Logger.Warning(ex, "An error occured while adding a document to the index"); } _settings.Update(settingsRecord); diff --git a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs index aa37a69e7..1dde1d257 100644 --- a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs +++ b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs @@ -27,34 +27,46 @@ namespace Orchard.Core.Indexing.Services { _clock = clock; _repository = repository; _contentManager = contentManager; + _settings = settings; Logger = NullLogger.Instance; } public ILogger Logger { get; set; } - public void CreateTask(ContentItem contentItem) { - if (contentItem == null) { + private void CreateTask(ContentItem contentItem, int action) { + if ( contentItem == null ) { throw new ArgumentNullException("contentItem"); } // remove previous tasks for the same content item var tasks = _repository - .Fetch(x => x.Id == contentItem.Id ) + .Fetch(x => x.ContentItemRecord.Id == contentItem.Id) .ToArray(); - foreach (var task in tasks) { + foreach ( var task in tasks ) { _repository.Delete(task); } var taskRecord = new IndexingTaskRecord { - CreatedUtc = _clock.UtcNow, - ContentItemRecord = contentItem.Record - }; + CreatedUtc = _clock.UtcNow, + ContentItemRecord = contentItem.Record, + Action = action + }; _repository.Create(taskRecord); + + } + public void CreateUpdateIndexTask(ContentItem contentItem) { + + CreateTask(contentItem, IndexingTaskRecord.Update); Logger.Information("Indexing task created for [{0}:{1}]", contentItem.ContentType, contentItem.Id); + } + public void CreateDeleteIndexTask(ContentItem contentItem) { + + CreateTask(contentItem, IndexingTaskRecord.Delete); + Logger.Information("Deleting index task created for [{0}:{1}]", contentItem.ContentType, contentItem.Id); } public IEnumerable GetTasks(DateTime? createdAfter) { diff --git a/src/Orchard/Indexing/IIndexProvider.cs b/src/Orchard/Indexing/IIndexProvider.cs index dcd44c06a..4045931e8 100644 --- a/src/Orchard/Indexing/IIndexProvider.cs +++ b/src/Orchard/Indexing/IIndexProvider.cs @@ -1,4 +1,6 @@ -namespace Orchard.Indexing { +using System.Collections.Generic; + +namespace Orchard.Indexing { public interface IIndexProvider : IDependency { /// /// Creates a new index @@ -15,11 +17,6 @@ /// void DeleteIndex(string name); - /// - /// Loads an existing document - /// - IIndexDocument Get(string indexName, int documentId); - /// /// Creates an empty document /// @@ -31,10 +28,20 @@ /// void Store(string indexName, IIndexDocument indexDocument); + /// + /// Adds a set of new document to the index + /// + void Store(string indexName, IEnumerable indexDocuments); + /// /// Removes an existing document from the index /// - void Delete(string indexName, int id); + void Delete(string indexName, int documentId); + + /// + /// Removes a set of existing document from the index + /// + void Delete(string indexName, IEnumerable documentIds); /// /// Creates a search builder for this provider diff --git a/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs b/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs index de913e167..cdb950e0f 100644 --- a/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs +++ b/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs @@ -4,9 +4,30 @@ using Orchard.ContentManagement; namespace Orchard.Tasks.Indexing { public interface IIndexingTaskManager : IDependency { - void CreateTask(ContentItem contentItem); + /// + /// Adds a new entry in the index task table in order to create an index for the specified content item. + /// + void CreateUpdateIndexTask(ContentItem contentItem); + + /// + /// Adds a new entry in the index task table in order to delete an existing index for the specified content item. + /// + void CreateDeleteIndexTask(ContentItem contentItem); + + /// + /// Loads all indexing tasks created after to a specific date and time + /// IEnumerable GetTasks(DateTime? createdAfter); + + /// + /// Deletes all indexing tasks previous to a specific date and time + /// void DeleteTasks(DateTime? createdBefore); + + /// + /// Deletes all indexing tasks assigned to a specific content item + /// + /// void DeleteTasks(ContentItem contentItem); } } \ No newline at end of file diff --git a/src/Orchard/Tasks/SweepGenerator.cs b/src/Orchard/Tasks/SweepGenerator.cs index b8fb5b64b..f811029b2 100644 --- a/src/Orchard/Tasks/SweepGenerator.cs +++ b/src/Orchard/Tasks/SweepGenerator.cs @@ -14,7 +14,7 @@ namespace Orchard.Tasks { _timer = new Timer(); _timer.Elapsed += Elapsed; Logger = NullLogger.Instance; - Interval = TimeSpan.FromMinutes(5); + Interval = TimeSpan.FromMinutes(1); } public ILogger Logger { get; set; } From b4eade4d4d9bb925e185a0d7de9a3ff4cb93daf2 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 3 Jun 2010 14:04:50 -0700 Subject: [PATCH 07/66] Start of the search UI - includes a single search/results page (URL needs to change, currently @ /Search/Search when the feature is enabled) --HG-- branch : dev --- .../Controllers/SearchController.cs | 28 +++++ .../Modules/Orchard.Search/Module.txt | 11 ++ .../Orchard.Search/Orchard.Search.csproj | 117 ++++++++++++++++++ .../Orchard.Search/Properties/AssemblyInfo.cs | 35 ++++++ .../Orchard.Search/Services/ISearchService.cs | 8 ++ .../Orchard.Search/Services/SearchService.cs | 25 ++++ .../Modules/Orchard.Search/Styles/search.css | 18 +++ .../ViewModels/SearchResultViewModel.cs | 9 ++ .../ViewModels/SearchViewModel.cs | 10 ++ .../Orchard.Search/Views/Search/Index.ascx | 15 +++ .../Modules/Orchard.Search/Views/Web.config | 34 +++++ .../Modules/Orchard.Search/Web.config | 60 +++++++++ src/Orchard.Web/Orchard.Web.csproj | 4 + src/Orchard.sln | 9 +- 14 files changed, 382 insertions(+), 1 deletion(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Module.txt create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Styles/search.css create mode 100644 src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchResultViewModel.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Views/Web.config create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Web.config diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs new file mode 100644 index 000000000..01f690dbc --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -0,0 +1,28 @@ +using System.Linq; +using System.Web.Mvc; +using Orchard.ContentManagement; +using Orchard.Search.Services; +using Orchard.Search.ViewModels; + +namespace Orchard.Search.Controllers { + public class SearchController : Controller { + private readonly ISearchService _searchService; + private readonly IContentManager _contentManager; + + public SearchController(ISearchService searchService, IContentManager contentManager) { + _searchService = searchService; + _contentManager = contentManager; + } + + public ActionResult Index(string term) { + var results = _searchService.Query(term); + return View(new SearchViewModel { + Term = term, + Results = results.Select(result => new SearchResultViewModel { + Content = _contentManager.BuildDisplayModel(_contentManager.Get(result.Id), "SummaryForSearch"), + SearchHit = result + }).ToList() + }); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Module.txt b/src/Orchard.Web/Modules/Orchard.Search/Module.txt new file mode 100644 index 000000000..9aaf4589a --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Module.txt @@ -0,0 +1,11 @@ +name: Search +antiforgery: enabled +author: The Orchard Team +website: http://orchardproject.net +version: 0.1 +orchardversion: 0.1.2010.0312 +description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere. +features: + Orchard.Search: + Description: Standard interface to Orchard's built-in search. + Category: Search \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj new file mode 100644 index 000000000..52d210945 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -0,0 +1,117 @@ + + + + Debug + AnyCPU + + + 2.0 + {4BE4EB01-AC56-4048-924E-2CA77F509ABA} + {F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + Orchard.Search + Orchard.Search + v4.0 + false + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + 3.5 + + + 3.5 + + + 3.5 + + + + 3.5 + + + + 3.5 + + + + + + + + + + + + + + + + + + + {2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6} + Orchard.Framework + + + + + + + + + + + + + + + + + + + + + + False + True + 47866 + / + + + False + True + http://orchard.codeplex.com + False + + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..fb34f0f84 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Orchard.Search")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Orchard.Search")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("fa37585c-b84e-4b5b-a7da-13692ff45a94")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs new file mode 100644 index 000000000..490fcc31c --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs @@ -0,0 +1,8 @@ +using System.Collections.Generic; +using Orchard.Indexing; + +namespace Orchard.Search.Services { + public interface ISearchService : IDependency { + IEnumerable Query(string term); + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs new file mode 100644 index 000000000..58069d0df --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; +using System.Linq; +using Orchard.Indexing; + +namespace Orchard.Search.Services +{ + public class SearchService : ISearchService + { + private readonly IIndexProvider _indexProvider; + + public SearchService(IIndexProvider indexProvider) { + _indexProvider = indexProvider; + } + + public IEnumerable Query(string term) { + if (string.IsNullOrWhiteSpace(term)) + return Enumerable.Empty(); + + return _indexProvider.CreateSearchBuilder("search") + .WithField("title", term) + .WithField("body", term) + .Search(); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Styles/search.css b/src/Orchard.Web/Modules/Orchard.Search/Styles/search.css new file mode 100644 index 000000000..3240b4d1c --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Styles/search.css @@ -0,0 +1,18 @@ +form.search { + float:left; +} +form.search input { + display:inline; + width:20em; +} +.search-summary { + float:right; + font-style:italic; + margin-top:0; +} +.search-summary em { + font-weight:bold; +} +.search-results { + clear:both; +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchResultViewModel.cs b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchResultViewModel.cs new file mode 100644 index 000000000..15e66c0b4 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchResultViewModel.cs @@ -0,0 +1,9 @@ +using Orchard.Indexing; +using Orchard.Mvc.ViewModels; + +namespace Orchard.Search.ViewModels { + public class SearchResultViewModel { + public ISearchHit SearchHit { get; set; } + public ContentItemViewModel Content { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs new file mode 100644 index 000000000..c01903cf8 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using Orchard.Indexing; +using Orchard.Mvc.ViewModels; + +namespace Orchard.Search.ViewModels { + public class SearchViewModel : BaseViewModel { + public IEnumerable Results { get; set; } + public string Term { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx new file mode 100644 index 000000000..2fbc3158e --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -0,0 +1,15 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Mvc.Html" %><% +Html.RegisterStyle("search.css"); %> +

<%=Html.TitleForPage(T("Search"))%>

<% +using(Html.BeginForm("index", "search", FormMethod.Get, new { @class = "search" })) { %> +
+ <%=Html.TextBoxFor(m => m.Term) %> + +
<% +} + +if (Model.Results.Count() > 0) { %> +

<%=T("{0} results", Model.Results.Count()) %>

+ <%=Html.UnorderedList(Model.Results, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString(), "search-results contentItems") %><% +} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Views/Web.config new file mode 100644 index 000000000..e065d8735 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Web.config @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Search/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Web.config new file mode 100644 index 000000000..c654951f1 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Web.config @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 92a1b60ed..2da25214d 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -155,6 +155,10 @@ {D10AD48F-407D-4DB5-A328-173EC7CB010F} Orchard.Roles + + {4BE4EB01-AC56-4048-924E-2CA77F509ABA} + Orchard.Search + {8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4} Orchard.Setup diff --git a/src/Orchard.sln b/src/Orchard.sln index 7337aa9e1..c1b3aa847 100644 --- a/src/Orchard.sln +++ b/src/Orchard.sln @@ -65,6 +65,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Profile", "Orchard. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MetaData", "Orchard.Web\Modules\Orchard.MetaData\Orchard.MetaData.csproj", "{23E04990-2A8D-41B8-9908-6DDB71EA3B23}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Search", "Orchard.Web\Modules\Orchard.Search\Orchard.Search.csproj", "{4BE4EB01-AC56-4048-924E-2CA77F509ABA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -183,12 +185,15 @@ Global {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Debug|Any CPU.Build.0 = Debug|Any CPU {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Release|Any CPU.ActiveCfg = Release|Any CPU {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Release|Any CPU.Build.0 = Release|Any CPU + {4BE4EB01-AC56-4048-924E-2CA77F509ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4BE4EB01-AC56-4048-924E-2CA77F509ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4BE4EB01-AC56-4048-924E-2CA77F509ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4BE4EB01-AC56-4048-924E-2CA77F509ABA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {94E694A2-D140-468D-A277-C5FCE1D13E9B} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {954CA994-D204-468B-9D69-51F6AD3E1C29} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {79AED36E-ABD0-4747-93D3-8722B042454B} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} @@ -204,11 +209,13 @@ Global {CDE24A24-01D3-403C-84B9-37722E18DFB7} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {17F86780-9A1F-4AA1-86F1-875EEC2730C7} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {23E04990-2A8D-41B8-9908-6DDB71EA3B23} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} + {4BE4EB01-AC56-4048-924E-2CA77F509ABA} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {F112851D-B023-4746-B6B1-8D2E5AD8F7AA} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {6CB3EB30-F725-45C0-9742-42599BA8E8D2} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {2FC1D9C8-446D-4414-B252-5E9FBE61EB63} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {7354DF37-934B-46CF-A13C-455D5F5F5413} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} + {94E694A2-D140-468D-A277-C5FCE1D13E9B} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {5E5E7A21-C7B2-44D8-8593-2F9541AE041D} = {383DBA32-4A3E-48D1-AAC3-75377A694452} {4AB4B5B6-277E-4FF6-B69B-7AE9E16D2A56} = {383DBA32-4A3E-48D1-AAC3-75377A694452} {33B1BC8D-E292-4972-A363-22056B207156} = {383DBA32-4A3E-48D1-AAC3-75377A694452} From 4ea06dd16df396483f531c53f554cb9968012f50 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 3 Jun 2010 14:23:45 -0700 Subject: [PATCH 08/66] Changed query param name for search to 'q' from 'Term' - also flipped ValidateInput for the controller off and tweaked the action for easier reading --HG-- branch : dev --- .../Controllers/SearchController.cs | 21 ++++++++++--------- .../Orchard.Search/Views/Search/Index.ascx | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs index 01f690dbc..5a535a4f2 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -3,8 +3,8 @@ using System.Web.Mvc; using Orchard.ContentManagement; using Orchard.Search.Services; using Orchard.Search.ViewModels; - namespace Orchard.Search.Controllers { + [ValidateInput(false)] public class SearchController : Controller { private readonly ISearchService _searchService; private readonly IContentManager _contentManager; @@ -14,15 +14,16 @@ namespace Orchard.Search.Controllers { _contentManager = contentManager; } - public ActionResult Index(string term) { - var results = _searchService.Query(term); - return View(new SearchViewModel { - Term = term, - Results = results.Select(result => new SearchResultViewModel { - Content = _contentManager.BuildDisplayModel(_contentManager.Get(result.Id), "SummaryForSearch"), - SearchHit = result - }).ToList() - }); + public ActionResult Index(string q) { + var searchViewModel = new SearchViewModel {Term = q}; + + var results = _searchService.Query(q); + searchViewModel.Results = results.Select(result => new SearchResultViewModel { + Content = _contentManager.BuildDisplayModel(_contentManager.Get(result.Id), "SummaryForSearch"), + SearchHit = result + }).ToList(); + + return View(searchViewModel); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index 2fbc3158e..144a490d8 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -4,7 +4,7 @@ Html.RegisterStyle("search.css"); %>

<%=Html.TitleForPage(T("Search"))%>

<% using(Html.BeginForm("index", "search", FormMethod.Get, new { @class = "search" })) { %>
- <%=Html.TextBoxFor(m => m.Term) %> + <%=Html.TextBox("q", Model.Term) %>
<% } From 4f711f1e2358781d4326c1f3014f7760ba4180dc Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 3 Jun 2010 14:36:38 -0700 Subject: [PATCH 09/66] Utilizing the IIndexManager in the SearchService instead of directly hitting the provider (since there might not be one) --HG-- branch : dev --- .../Modules/Orchard.Search/Services/SearchService.cs | 10 +++++----- .../Modules/Orchard.Search/Views/Search/Index.ascx | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs index 58069d0df..27c7b6fc7 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs @@ -6,17 +6,17 @@ namespace Orchard.Search.Services { public class SearchService : ISearchService { - private readonly IIndexProvider _indexProvider; + private readonly IIndexManager _indexManager; - public SearchService(IIndexProvider indexProvider) { - _indexProvider = indexProvider; + public SearchService(IIndexManager indexManager) { + _indexManager = indexManager; } public IEnumerable Query(string term) { - if (string.IsNullOrWhiteSpace(term)) + if (string.IsNullOrWhiteSpace(term) || !_indexManager.HasIndexProvider()) return Enumerable.Empty(); - return _indexProvider.CreateSearchBuilder("search") + return _indexManager.GetSearchIndexProvider().CreateSearchBuilder("search") .WithField("title", term) .WithField("body", term) .Search(); diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index 144a490d8..8811982c1 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -9,7 +9,10 @@ using(Html.BeginForm("index", "search", FormMethod.Get, new { @class = "search" <% } +if (!string.IsNullOrWhiteSpace(Model.Term)) { %> +

<%=T("{0} results", Model.Results.Count()) %>

<% +} + if (Model.Results.Count() > 0) { %> -

<%=T("{0} results", Model.Results.Count()) %>

<%=Html.UnorderedList(Model.Results, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString(), "search-results contentItems") %><% } %> \ No newline at end of file From 5084d2b4ddf7ac8f13ba8c670076061819d1fa0e Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 3 Jun 2010 14:54:35 -0700 Subject: [PATCH 10/66] Corrected blog post handler for background tasks --HG-- branch : dev --- src/Orchard/Mvc/MvcModule.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs index c88c941b0..76d24a5a6 100644 --- a/src/Orchard/Mvc/MvcModule.cs +++ b/src/Orchard/Mvc/MvcModule.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Specialized; using System.Web; using System.Web.Mvc; using System.Web.Routing; @@ -82,6 +83,13 @@ namespace Orchard.Mvc { public override bool IsAuthenticated { get { return false; } } + + // empty collection provided for background operation + public override NameValueCollection Form { + get { + return new NameValueCollection(); + } + } } } } \ No newline at end of file From 43f1031054f16eaaefeb26d1518b6f7bc0fdb31a Mon Sep 17 00:00:00 2001 From: Suha Can Date: Thu, 3 Jun 2010 15:47:35 -0700 Subject: [PATCH 11/66] - Adding localizers to admin menu providers. - A few missing localized strings and french translations were added. Need native french speakers to fully translate Orchard in french. --HG-- branch : dev --- .../Localization/en-US/orchard.core.po | 250 +++++++++++++++++ .../Localization/fr-FR/orchard.core.po | 252 +++++++++++++++++- src/Orchard.Web/Core/Dashboard/AdminMenu.cs | 8 +- src/Orchard.Web/Core/Navigation/AdminMenu.cs | 8 +- src/Orchard.Web/Core/Settings/AdminMenu.cs | 8 +- .../Modules/Orchard.Blogs/AdminMenu.cs | 13 +- .../Modules/Orchard.Comments/AdminMenu.cs | 9 +- .../Modules/Orchard.Media/AdminMenu.cs | 9 +- .../Modules/Orchard.MetaData/AdminMenu.cs | 6 +- .../Modules/Orchard.Modules/AdminMenu.cs | 11 +- .../Modules/Orchard.MultiTenancy/AdminMenu.cs | 11 +- .../Modules/Orchard.Pages/AdminMenu.cs | 11 +- .../Modules/Orchard.Roles/AdminMenu.cs | 10 +- .../Modules/Orchard.Tags/AdminMenu.cs | 8 +- .../Modules/Orchard.Themes/AdminMenu.cs | 8 +- .../Modules/Orchard.Users/AdminMenu.cs | 10 +- .../Orchard.Users/Views/Account/LogOn.ascx | 2 +- 17 files changed, 584 insertions(+), 50 deletions(-) diff --git a/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po b/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po index 7c354db9c..a459214e8 100644 --- a/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po +++ b/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po @@ -23,6 +23,21 @@ msgstr "[more]" msgid "Welcome to Orchard" msgstr "Welcome to Orchard" +#: ~/Core/Dashboard/Views/Admin/Index.ascx +#| msgid : "The Orchard Team" +msgid "The Orchard Team" +msgstr "The Orchard Team" + +#: ~/Core/Dashboard/Views/Admin/Index.ascx +#| msgid : "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”." +msgid "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”." +msgstr "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”." + +#: ~/Core/Dashboard/Views/Admin/Index.ascx +#| msgid : "Have fun!" +msgid "Have fun!" +msgstr "Have fun!" + #: ~/Core/Navigation/Controllers/AdminController.cs #| msgid : "Not allowed to manage the main menu" msgid "Not allowed to manage the main menu" @@ -278,6 +293,16 @@ msgstr "Edit Post" msgid "Discard Draft" msgstr "Discard Draft" +#: ~/Modules/Orchard.Comments/AdminMenu.cs +#| msgid : "Comments" +msgid "Comments" +msgstr "Comments" + +#: ~/Modules/Orchard.Comments/AdminMenu.cs +#| msgid : "Manage Comments" +msgid "Manage Comments" +msgstr "Manage Comments" + #: ~/Modules/Orchard.Comments/Controllers/AdminController.cs #| msgid : "Listing comments failed: " msgid "Listing comments failed: " @@ -438,11 +463,36 @@ msgstr "Manage Comments" msgid "log on" msgstr "log on" +#: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Add a Comment" +msgid "Add a Comment" +msgstr "Add a Comment" + +#: ~/Themes/Contoso/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "You must {0} to comment." +msgid "You must {0} to comment." +msgstr "You must {0} to comment." + +#: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Comments have been disabled for this content." +msgid "Comments have been disabled for this content." +msgstr "Comments have been disabled for this content." + #: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx #| msgid : "Hi, {0}!" msgid "Hi, {0}!" msgstr "Hi, {0}!" +#: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Comment" +msgid "Comment" +msgstr "Comment" + +#: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Submit Comment" +msgid "Submit Comment" +msgstr "Submit Comment" + #: ~/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.HasComments.ascx #| msgid : "Comments are shown. Existing comments are displayed." msgid "Comments are shown. Existing comments are displayed." @@ -1748,11 +1798,41 @@ msgstr "User deleted" msgid "Access Denied" msgstr "Access Denied" +#: ~/Modules/Orchard.Users/Views/Account/AccessDenied.ascx +#| msgid : "You do not have permission to complete your request." +msgid "You do not have permission to complete your request." +msgstr "You do not have permission to complete your request." + #: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx #| msgid : "Change Password" msgid "Change Password" msgstr "Change Password" +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "Use the form below to change your password." +msgid "Use the form below to change your password." +msgstr "Use the form below to change your password." + +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "New passwords are required to be a minimum of {0} characters in length." +msgid "New passwords are required to be a minimum of {0} characters in length." +msgstr "New passwords are required to be a minimum of {0} characters in length." + +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "Current password:" +msgid "Current password:" +msgstr "Current password:" + +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "New password:" +msgid "New password:" +msgstr "New password:" + +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "Confirm new password:" +msgid "Confirm new password:" +msgstr "Confirm new password:" + #: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx #| msgid : "Password change was unsuccessful. Please correct the errors and try again." msgid "Password change was unsuccessful. Please correct the errors and try again." @@ -1763,16 +1843,81 @@ msgstr "Password change was unsuccessful. Please correct the errors and try agai msgid "Change Password" msgstr "Change Password" +#: ~/Modules/Orchard.Users/Views/Account/ChangePasswordSuccess.ascx +#| msgid : "Your password has been changed successfully." +msgid "Your password has been changed successfully." +msgstr "Your password has been changed successfully." + #: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx #| msgid : "Login was unsuccessful. Please correct the errors and try again." msgid "Login was unsuccessful. Please correct the errors and try again." msgstr "Login was unsuccessful. Please correct the errors and try again." +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Please enter your username and password." +msgid "Please enter your username and password." +msgstr "Please enter your username and password." + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Register" +msgid "Register" +msgstr "Register" + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : " if you don't have an account." +msgid " if you don't have an account." +msgstr " if you don't have an account." + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Account Information" +msgid "Account Information" +msgstr "Account Information" + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Username or Email:" +msgid "Username or Email:" +msgstr "Username or Email:" + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Password:" +msgid "Password:" +msgstr "Password:" + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Remember me?" +msgid "Remember me?" +msgstr "Remember me?" + #: ~/Modules/Orchard.Users/Views/Account/Register.ascx #| msgid : "Create a New Account" msgid "Create a New Account" msgstr "Create a New Account" +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Use the form below to create a new account." +msgid "Use the form below to create a new account." +msgstr "Use the form below to create a new account." + +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Passwords are required to be a minimum of {0} characters in length." +msgid "Passwords are required to be a minimum of {0} characters in length." +msgstr "Passwords are required to be a minimum of {0} characters in length." + +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Username:" +msgid "Username:" +msgstr "Username:" + +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Email:" +msgid "Email:" +msgstr "Email: + +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Confirm password:" +msgid "Confirm password:" +msgstr "Confirm password:" + #: ~/Modules/Orchard.Users/Views/Account/Register.ascx #| msgid : "Account creation was unsuccessful. Please correct the errors and try again." msgid "Account creation was unsuccessful. Please correct the errors and try again." @@ -1823,6 +1968,41 @@ msgstr "nobody(?)" msgid "Login was unsuccessful. Please correct the errors and try again." msgstr "Login was unsuccessful. Please correct the errors and try again." +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Please enter your username and password." +msgid "Please enter your username and password." +msgstr "Please enter your username and password." + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Register" +msgid "Register" +msgstr "Register" + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : " if you don't have an account." +msgid " if you don't have an account." +msgstr " if you don't have an account." + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Account Information" +msgid "Account Information" +msgstr "Account Information" + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Username or Email:" +msgid "Username or Email:" +msgstr "Username or Email:" + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Password:" +msgid "Password:" +msgstr "Password:" + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Remember me?" +msgid "Remember me?" +msgstr "Remember me?" + #: ~/Themes/Contoso/Views/User.ascx #| msgid : "Log Off" msgid "Log Off" @@ -1848,6 +2028,21 @@ msgstr "Archives" msgid "log on" msgstr "log on" +#: ~/Themes/Contoso/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Add a Comment" +msgid "Add a Comment" +msgstr "Add a Comment" + +#: ~/Themes/Contoso/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "You must {0} to comment." +msgid "You must {0} to comment." +msgstr "You must {0} to comment." + +#: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Comments have been disabled for this content." +msgid "Comments have been disabled for this content." +msgstr "Comments have been disabled for this content." + #: ~/Themes/Contoso/Views/DisplayTemplates/Parts/Comments.HasComments.ascx #| msgid : "Hi, {0}!" msgid "Hi, {0}!" @@ -1863,6 +2058,41 @@ msgstr "nobody(?)" msgid "Login was unsuccessful. Please correct the errors and try again." msgstr "Login was unsuccessful. Please correct the errors and try again." +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Please enter your username and password." +msgid "Please enter your username and password." +msgstr "Please enter your username and password." + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Register" +msgid "Register" +msgstr "Register" + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : " if you don't have an account." +msgid " if you don't have an account." +msgstr " if you don't have an account." + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Account Information" +msgid "Account Information" +msgstr "Account Information" + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Username or Email:" +msgid "Username or Email:" +msgstr "Username or Email:" + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Password:" +msgid "Password:" +msgstr "Password:" + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Remember me?" +msgid "Remember me?" +msgstr "Remember me?" + #: ~/Themes/Corporate/Views/User.ascx #| msgid : "Log Off" msgid "Log Off" @@ -1893,6 +2123,21 @@ msgstr "log on" msgid "Hi, {0}!" msgstr "Hi, {0}!" +#: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Add a Comment" +msgid "Add a Comment" +msgstr "Add a Comment" + +#: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "You must {0} to comment." +msgid "You must {0} to comment." +msgstr "You must {0} to comment." + +#: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Comments have been disabled for this content." +msgid "Comments have been disabled for this content." +msgstr "Comments have been disabled for this content." + #: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx #| msgid : "nobody(?)" msgid "nobody(?)" @@ -1918,6 +2163,11 @@ msgstr "Your Site" msgid "Logout" msgstr "Logout" +#: ~/Themes/TheAdmin/Views/User.ascx +#| msgid : "User:" +msgid "User:" +msgstr "User:" + #: ~/Commands/DefaultOrchardCommandHandler.cs #| msgid : "Switch was not found: " msgid "Switch was not found: " diff --git a/src/Orchard.Web/Core/App_Data/Localization/fr-FR/orchard.core.po b/src/Orchard.Web/Core/App_Data/Localization/fr-FR/orchard.core.po index a469a4511..66a0c6db2 100644 --- a/src/Orchard.Web/Core/App_Data/Localization/fr-FR/orchard.core.po +++ b/src/Orchard.Web/Core/App_Data/Localization/fr-FR/orchard.core.po @@ -23,6 +23,21 @@ msgstr "[En voir plus]" msgid "Welcome to Orchard" msgstr "Bienvenue dans Orchard" +#: ~/Core/Dashboard/Views/Admin/Index.ascx +#| msgid : "The Orchard Team" +msgid "The Orchard Team" +msgstr "L'Equipe Orchard" + +#: ~/Core/Dashboard/Views/Admin/Index.ascx +#| msgid : "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”." +msgid "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”." +msgstr "C'est l'endroit pour la gestion de votre site, son apparence et son contenu. Veuillez prendre votre temps explorer le menu à gauche de l'écran pour vous familiariser avec les aspects de l'application. Par exemple, essayez de changer le thème en utilisant le menu “Manage Themes”. Vous pouvez aussi créer de nouvelles pages et gérer les pages existantes via le menu “Manage Pages” ou bien créer des blogs via “Manage Blogs”." + +#: ~/Core/Dashboard/Views/Admin/Index.ascx +#| msgid : "Have fun!" +msgid "Have fun!" +msgstr "Amusez-vous bien!" + #: ~/Core/Navigation/Controllers/AdminController.cs #| msgid : "Not allowed to manage the main menu" msgid "Not allowed to manage the main menu" @@ -278,6 +293,16 @@ msgstr "Modifier un billet" msgid "Discard Draft" msgstr "Effacer le brouillon" +#: ~/Modules/Orchard.Comments/AdminMenu.cs +#| msgid : "Comments" +msgid "Comments" +msgstr "Commentaires" + +#: ~/Modules/Orchard.Comments/AdminMenu.cs +#| msgid : "Manage Comments" +msgid "Manage Comments" +msgstr "Gérer les Commentaires" + #: ~/Modules/Orchard.Comments/Controllers/AdminController.cs #| msgid : "Listing comments failed: " msgid "Listing comments failed: " @@ -436,13 +461,38 @@ msgstr "Gérer les commentaires" #: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx #| msgid : "log on" msgid "log on" -msgstr "S'authentifier" +msgstr "s'authentifier" + +#: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Add a Comment" +msgid "Add a Comment" +msgstr "Ajouter un commentaire" + +#: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "You must {0} to comment." +msgid "You must {0} to comment." +msgstr "Vous devez {0} pour ajouter un commentaire." + +#: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Comments have been disabled for this content." +msgid "Comments have been disabled for this content." +msgstr "Les commentaires ont été désactivés pour ce contenu." #: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx #| msgid : "Hi, {0}!" msgid "Hi, {0}!" msgstr "Bonjour {0}!" +#: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Comment" +msgid "Comment" +msgstr "Commentaire" + +#: ~/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Submit Comment" +msgid "Submit Comment" +msgstr "Envoyer le commentaire" + #: ~/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.HasComments.ascx #| msgid : "Comments are shown. Existing comments are displayed." msgid "Comments are shown. Existing comments are displayed." @@ -1748,11 +1798,41 @@ msgstr "Utilisateur effacé" msgid "Access Denied" msgstr "Accès refusé" +#: ~/Modules/Orchard.Users/Views/Account/AccessDenied.ascx +#| msgid : "You do not have permission to complete your request." +msgid "You do not have permission to complete your request." +msgstr "Vous n'avez pas la permission de compléter votre requête" + #: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx #| msgid : "Change Password" msgid "Change Password" msgstr "Changer le mot de passe" +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "Use the form below to change your password." +msgid "Use the form below to change your password." +msgstr "Utilisez le forumulaire ci-dessous pour changer votre mot de passe." + +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "New passwords are required to be a minimum of {0} characters in length." +msgid "New passwords are required to be a minimum of {0} characters in length." +msgstr "Les mots de passe doivent contenir {0} charactères au minimum." + +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "Current password:" +msgid "Current password:" +msgstr "Mot de passe courant:" + +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "New password:" +msgid "New password:" +msgstr "Nouveau mot de passe:" + +#: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx +#| msgid : "Confirm new password:" +msgid "Confirm new password:" +msgstr "Confirmez le nouveau mot de passe:" + #: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx #| msgid : "Password change was unsuccessful. Please correct the errors and try again." msgid "Password change was unsuccessful. Please correct the errors and try again." @@ -1763,16 +1843,81 @@ msgstr "Le changement de mot de passe a échoué. Veuillez corriger les erreurs msgid "Change Password" msgstr "Changer le mot de passe" +#: ~/Modules/Orchard.Users/Views/Account/ChangePasswordSuccess.ascx +#| msgid : "Your password has been changed successfully." +msgid "Your password has been changed successfully." +msgstr "Votre mot de passe a été changé." + #: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx #| msgid : "Login was unsuccessful. Please correct the errors and try again." msgid "Login was unsuccessful. Please correct the errors and try again." msgstr "La connexion a échoué. Veuillez corriger les erreurs et réessayer." +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Please enter your username and password." +msgid "Please enter your username and password." +msgstr "Veuillez saisir votre nom d'utilisateur et mot de passe." + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Register" +msgid "Register" +msgstr "Enregistrer" + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : " if you don't have an account." +msgid " if you don't have an account." +msgstr " si vous n'avez pas de compte." + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Account Information" +msgid "Account Information" +msgstr "Données de Compte" + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Username or Email:" +msgid "Username or Email:" +msgstr "Nom d'utilisateur ou e-mail:" + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Password:" +msgid "Password:" +msgstr "Mot de passe:" + +#: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx +#| msgid : "Remember me?" +msgid "Remember me?" +msgstr "Souviens-moi?" + #: ~/Modules/Orchard.Users/Views/Account/Register.ascx #| msgid : "Create a New Account" msgid "Create a New Account" msgstr "Créer un nouveau compte utilisateur" +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Use the form below to create a new account." +msgid "Use the form below to create a new account." +msgstr "Utiliser le formulaire ci-dessous pour créer un nouveau compte." + +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Passwords are required to be a minimum of {0} characters in length." +msgid "Passwords are required to be a minimum of {0} characters in length." +msgstr "Les mots de passe doivent contenir {0} charactères au minimum." + +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Username:" +msgid "Username:" +msgstr "Nom d'utilisateur:" + +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Email:" +msgid "Email:" +msgstr "E-mail: + +#: ~/Modules/Orchard.Users/Views/Account/Register.ascx +#| msgid : "Confirm password:" +msgid "Confirm password:" +msgstr "Confirmez le mot de passe:" + #: ~/Modules/Orchard.Users/Views/Account/Register.ascx #| msgid : "Account creation was unsuccessful. Please correct the errors and try again." msgid "Account creation was unsuccessful. Please correct the errors and try again." @@ -1823,6 +1968,41 @@ msgstr "personne(?)" msgid "Login was unsuccessful. Please correct the errors and try again." msgstr "La connexion a échoué. Veuillez corriger les erreurs et réessayer." +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Please enter your username and password." +msgid "Please enter your username and password." +msgstr "Veuillez saisir votre nom d'utilisateur et mot de passe." + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Register" +msgid "Register" +msgstr "Enregistrer" + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : " if you don't have an account." +msgid " if you don't have an account." +msgstr " si vous n'avez pas de compte." + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Account Information" +msgid "Account Information" +msgstr "Données de Compte" + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Username or Email:" +msgid "Username or Email:" +msgstr "Nom d'utilisateur ou e-mail:" + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Password:" +msgid "Password:" +msgstr "Mot de passe:" + +#: ~/Themes/Contoso/Views/LogOn.ascx +#| msgid : "Remember me?" +msgid "Remember me?" +msgstr "Souviens-moi?" + #: ~/Themes/Contoso/Views/User.ascx #| msgid : "Log Off" msgid "Log Off" @@ -1848,6 +2028,21 @@ msgstr "Archives" msgid "log on" msgstr "se connecter" +#: ~/Themes/Contoso/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Add a Comment" +msgid "Add a Comment" +msgstr "Ajouter un commentaire" + +#: ~/Themes/Contoso/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "You must {0} to comment." +msgid "You must {0} to comment." +msgstr "Vous devez {0} pour ajouter un commentaire." + +#: ~/Themes/Contoso/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Comments have been disabled for this content." +msgid "Comments have been disabled for this content." +msgstr "Les commentaires ont été désactivés pour ce contenu." + #: ~/Themes/Contoso/Views/DisplayTemplates/Parts/Comments.HasComments.ascx #| msgid : "Hi, {0}!" msgid "Hi, {0}!" @@ -1863,6 +2058,41 @@ msgstr "personne(?)" msgid "Login was unsuccessful. Please correct the errors and try again." msgstr "La connexion a échoué. Veuillez corriger les erreurs et réessayer." +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Please enter your username and password." +msgid "Please enter your username and password." +msgstr "Veuillez saisir votre nom d'utilisateur et mot de passe." + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Register" +msgid "Register" +msgstr "Enregistrer" + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : " if you don't have an account." +msgid " if you don't have an account." +msgstr " si vous n'avez pas de compte." + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Account Information" +msgid "Account Information" +msgstr "Données de Compte" + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Username or Email:" +msgid "Username or Email:" +msgstr "Nom d'utilisateur ou e-mail:" + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Password:" +msgid "Password:" +msgstr "Mot de passe:" + +#: ~/Themes/Corporate/Views/LogOn.ascx +#| msgid : "Remember me?" +msgid "Remember me?" +msgstr "Souviens-moi?" + #: ~/Themes/Corporate/Views/User.ascx #| msgid : "Log Off" msgid "Log Off" @@ -1888,6 +2118,21 @@ msgstr "Archives" msgid "log on" msgstr "se connecter" +#: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Add a Comment" +msgid "Add a Comment" +msgstr "Ajouter un commentaire" + +#: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "You must {0} to comment." +msgid "You must {0} to comment." +msgstr "Vous devez {0} pour ajouter un commentaire." + +#: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +#| msgid : "Comments have been disabled for this content." +msgid "Comments have been disabled for this content." +msgstr "Les commentaires ont été désactivés pour ce contenu." + #: ~/Themes/Corporate/Views/DisplayTemplates/Parts/Comments.HasComments.ascx #| msgid : "Hi, {0}!" msgid "Hi, {0}!" @@ -1918,6 +2163,11 @@ msgstr "Votre site" msgid "Logout" msgstr "Déconnexion" +#: ~/Themes/TheAdmin/Views/User.ascx +#| msgid : "User:" +msgid "User:" +msgstr "Utilisateur:" + #: ~/Commands/DefaultOrchardCommandHandler.cs #| msgid : "Switch was not found: " msgid "Switch was not found: " diff --git a/src/Orchard.Web/Core/Dashboard/AdminMenu.cs b/src/Orchard.Web/Core/Dashboard/AdminMenu.cs index 7b5dc0123..d960f6400 100644 --- a/src/Orchard.Web/Core/Dashboard/AdminMenu.cs +++ b/src/Orchard.Web/Core/Dashboard/AdminMenu.cs @@ -1,13 +1,15 @@ -using Orchard.Security; +using Orchard.Localization; +using Orchard.Security; using Orchard.UI.Navigation; namespace Orchard.Core.Dashboard { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Orchard", "0", - menu => menu.Add("Dashboard", "0", item => item.Action("Index", "Admin", new { area = "Dashboard" }).Permission(StandardPermissions.AccessAdminPanel))); + builder.Add(T("Orchard"), "0", + menu => menu.Add(T("Dashboard"), "0", item => item.Action("Index", "Admin", new { area = "Dashboard" }).Permission(StandardPermissions.AccessAdminPanel))); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Navigation/AdminMenu.cs b/src/Orchard.Web/Core/Navigation/AdminMenu.cs index 0b46da08e..e95ddf1d2 100644 --- a/src/Orchard.Web/Core/Navigation/AdminMenu.cs +++ b/src/Orchard.Web/Core/Navigation/AdminMenu.cs @@ -1,13 +1,15 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.Core.Navigation { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Site", "12", + builder.Add(T("Site"), "12", menu => menu - .Add("Manage Menu", "6.0", item => item.Action("Index", "Admin", new { area = "Navigation" }).Permission(Permissions.ManageMainMenu))); + .Add(T("Manage Menu"), "6.0", item => item.Action("Index", "Admin", new { area = "Navigation" }).Permission(Permissions.ManageMainMenu))); } } } diff --git a/src/Orchard.Web/Core/Settings/AdminMenu.cs b/src/Orchard.Web/Core/Settings/AdminMenu.cs index 498f3266e..01f32cd77 100644 --- a/src/Orchard.Web/Core/Settings/AdminMenu.cs +++ b/src/Orchard.Web/Core/Settings/AdminMenu.cs @@ -1,13 +1,15 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.Core.Settings { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Site", "11", + builder.Add(T("Site"), "11", menu => menu - .Add("Manage Settings", "2.0", item => item.Action("Index", "Admin", new { area = "Settings" }).Permission(Permissions.ManageSettings))); + .Add(T("Manage Settings"), "2.0", item => item.Action("Index", "Admin", new { area = "Settings" }).Permission(Permissions.ManageSettings))); } } } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs index d692251d9..807ba6336 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs @@ -1,5 +1,6 @@ using System.Linq; using Orchard.Blogs.Services; +using Orchard.Localization; using Orchard.UI.Navigation; namespace Orchard.Blogs { @@ -10,10 +11,12 @@ namespace Orchard.Blogs { _blogService = blogService; } + public Localizer T { get; set; } + public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Blogs", "2", BuildMenu); + builder.Add(T("Blogs"), "2", BuildMenu); } private void BuildMenu(NavigationItemBuilder menu) { @@ -22,20 +25,20 @@ namespace Orchard.Blogs { var singleBlog = blogCount == 1 ? blogs.ElementAt(0) : null; if (blogCount > 0 && singleBlog == null) - menu.Add("Manage Blogs", "1.0", + menu.Add(T("Manage Blogs"), "1.0", item => item.Action("List", "BlogAdmin", new {area = "Orchard.Blogs"}).Permission(Permissions.MetaListBlogs)); else if (singleBlog != null) - menu.Add("Manage Blog", "1.0", + menu.Add(T("Manage Blog"), "1.0", item => item.Action("Item", "BlogAdmin", new {area = "Orchard.Blogs", blogSlug = singleBlog.Slug}).Permission(Permissions.MetaListBlogs)); - menu.Add("Add New Blog", "1.1", + menu.Add(T("Add New Blog"), "1.1", item => item.Action("Create", "BlogAdmin", new {area = "Orchard.Blogs"}).Permission(Permissions.ManageBlogs)); if (singleBlog != null) - menu.Add("Add New Post", "1.2", + menu.Add(T("Add New Post"), "1.2", item => item.Action("Create", "BlogPostAdmin", new {area = "Orchard.Blogs", blogSlug = singleBlog.Slug}).Permission(Permissions.PublishBlogPost)); } diff --git a/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs index fea261884..583ae82e2 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs @@ -1,13 +1,16 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.Comments { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } + public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Comments", "3", + builder.Add(T("Comments"), "3", menu => menu - .Add("Manage Comments", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Comments" }).Permission(Permissions.ManageComments)) + .Add(T("Manage Comments"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Comments" }).Permission(Permissions.ManageComments)) ); } } diff --git a/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs index 8bc691067..f81ed3319 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs @@ -1,13 +1,16 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.Media { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } + public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Media", "4", + builder.Add(T("Media"), "4", menu => menu - .Add("Manage Media", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Media" }).Permission(Permissions.ManageMediaFiles)) + .Add(T("Manage Media"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Media" }).Permission(Permissions.ManageMediaFiles)) ); } } diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs index ad2c436d5..24956fde2 100644 --- a/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs @@ -1,16 +1,18 @@  +using Orchard.Localization; using Orchard.UI.Navigation; namespace Orchard.MetaData { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Content Types", "5", + builder.Add(T("Content Types"), "5", menu => menu - .Add("Content Types", "1.0", item => item.Action("ContentTypeList", "MetaData", new { area = "Orchard.MetaData" }).Permission(Permissions.ManageMetaData)) + .Add(T("Content Types"), "1.0", item => item.Action("ContentTypeList", "MetaData", new { area = "Orchard.MetaData" }).Permission(Permissions.ManageMetaData)) ); } diff --git a/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs index 9db153432..6ac566a6f 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs @@ -1,15 +1,18 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.Modules { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } + public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Features", "10", + builder.Add(T("Features"), "10", menu => menu - .Add("Manage Features", "1.0", item => item.Action("Features", "Admin", new { area = "Orchard.Modules" }) + .Add(T("Manage Features"), "1.0", item => item.Action("Features", "Admin", new { area = "Orchard.Modules" }) .Permission(Permissions.ManageFeatures)) - .Add("Installed Modules", "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Modules" }) + .Add(T("Installed Modules"), "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Modules" }) .Permission(Permissions.ManageModules))); } } diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs index aab63b491..5eca44687 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs @@ -1,14 +1,17 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.MultiTenancy { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } + public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Tenants", "22", + builder.Add(T("Tenants"), "22", menu => menu - .Add("Manage Tenants", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.MultiTenancy" }).Permission(Permissions.ManageTenants)) - .Add("Add New Tenant", "1.1", item => item.Action("Add", "Admin", new { area = "Orchard.MultiTenancy" }).Permission(Permissions.ManageTenants))); + .Add(T("Manage Tenants"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.MultiTenancy" }).Permission(Permissions.ManageTenants)) + .Add(T("Add New Tenant"), "1.1", item => item.Action("Add", "Admin", new { area = "Orchard.MultiTenancy" }).Permission(Permissions.ManageTenants))); } } } diff --git a/src/Orchard.Web/Modules/Orchard.Pages/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Pages/AdminMenu.cs index 4a184c6c6..8467d8040 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Pages/AdminMenu.cs @@ -1,4 +1,5 @@ -using Orchard.Pages.Services; +using Orchard.Localization; +using Orchard.Pages.Services; using Orchard.UI.Navigation; namespace Orchard.Pages { @@ -9,19 +10,21 @@ namespace Orchard.Pages { _pageService = pageService; } + public Localizer T { get; set; } + public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Pages", "1", BuildMenu); + builder.Add(T("Pages"), "1", BuildMenu); } private void BuildMenu(NavigationItemBuilder menu) { if (_pageService.GetCount() > 0) - menu.Add("Manage Pages", "1.0", + menu.Add(T("Manage Pages"), "1.0", item => item.Action("List", "Admin", new {area = "Orchard.Pages"}).Permission(Permissions.MetaListPages)); - menu.Add("Add New Page", "1.1", + menu.Add(T("Add New Page"), "1.1", item => item.Action("Create", "Admin", new {area = "Orchard.Pages"}).Permission(Permissions.EditPages)); } diff --git a/src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs index 6792b3021..b4373bb74 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs @@ -1,14 +1,16 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.Roles { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Users", "5", + builder.Add(T("Users"), "5", menu => menu - .Add("Manage Roles", "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Roles" }).Permission(Permissions.ManageRoles)) - .Add("Add New Role", "2.1", item => item.Action("Create", "Admin", new { area = "Orchard.Roles" }).Permission(Permissions.ManageRoles))); + .Add(T("Manage Roles"), "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Roles" }).Permission(Permissions.ManageRoles)) + .Add(T("Add New Role"), "2.1", item => item.Action("Create", "Admin", new { area = "Orchard.Roles" }).Permission(Permissions.ManageRoles))); } } } diff --git a/src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs index 231e0a696..43c57efce 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs @@ -1,13 +1,15 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.Tags { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Tags", "3", + builder.Add(T("Tags"), "3", menu => menu - .Add("Manage Tags", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Tags" }).Permission(Permissions.ManageTags)) + .Add(T("Manage Tags"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Tags" }).Permission(Permissions.ManageTags)) ); } } diff --git a/src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs index 80889c706..52fb1e02c 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs @@ -1,13 +1,15 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.Themes { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Site", "11", + builder.Add(T("Site"), "11", menu => menu - .Add("Manage Themes", "4.0", item => item.Action("Index", "Admin", new { area = "Orchard.Themes" }) + .Add(T("Manage Themes"), "4.0", item => item.Action("Index", "Admin", new { area = "Orchard.Themes" }) .Permission(Permissions.ManageThemes).Permission(Permissions.ApplyTheme))); } } diff --git a/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs index ff3b75ad1..874e2e95a 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs @@ -1,14 +1,16 @@ -using Orchard.UI.Navigation; +using Orchard.Localization; +using Orchard.UI.Navigation; namespace Orchard.Users { public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { - builder.Add("Users", "5", + builder.Add(T("Users"), "5", menu => menu - .Add("Manage Users", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Users" }).Permission(Permissions.ManageUsers)) - .Add("Add New User", "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.Users" }).Permission(Permissions.ManageUsers))); + .Add(T("Manage Users"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Users" }).Permission(Permissions.ManageUsers)) + .Add(T("Add New User"), "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.Users" }).Permission(Permissions.ManageUsers))); } } } diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx index 71020cb5d..c6813f5cc 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Users.ViewModels"%>

<%=Html.TitleForPage(Model.Title)%>

-

<%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink("Register", "Register")%><%=_Encoded(" if you don't have an account.")%>

+

<%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink(T("Register"), "Register")%><%=_Encoded(" if you don't have an account.")%>

<%= Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())%> <% using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Request.QueryString["ReturnUrl"]}))) { %> From dcc51f28c6c9551c70714b6cc2b62051f94fd480 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 3 Jun 2010 16:17:31 -0700 Subject: [PATCH 12/66] A search box for anyone. - pulled the search box out into its own partial - added a search filter that sticks the search form partial into the search zone - added the search zone to the top of the classic theme's sidebar --HG-- branch : dev --- .../Orchard.Search/Filters/SearchFilter.cs | 18 ++++++++++++++++++ .../Orchard.Search/Orchard.Search.csproj | 2 ++ .../Orchard.Search/Views/Search/Index.ascx | 10 +++------- .../Orchard.Search/Views/SearchForm.ascx | 8 ++++++++ src/Orchard.Web/Themes/Classic/Styles/site.css | 10 ++++++++-- .../Themes/Classic/Views/Layout.ascx | 3 ++- 6 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Filters/SearchFilter.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.ascx diff --git a/src/Orchard.Web/Modules/Orchard.Search/Filters/SearchFilter.cs b/src/Orchard.Web/Modules/Orchard.Search/Filters/SearchFilter.cs new file mode 100644 index 000000000..1808581d7 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Filters/SearchFilter.cs @@ -0,0 +1,18 @@ +using System.Web.Mvc; +using Orchard.Mvc.Filters; +using Orchard.Mvc.ViewModels; +using Orchard.Search.ViewModels; + +namespace Orchard.Search.Filters { + public class SearchFilter : FilterProvider, IResultFilter { + public void OnResultExecuting(ResultExecutingContext filterContext) { + var viewModel = filterContext.Controller.ViewData.Model as BaseViewModel; + + if (viewModel != null) + viewModel.Zones.AddRenderPartial("search", "SearchForm", viewModel is SearchViewModel ? viewModel : new SearchViewModel()); + } + + public void OnResultExecuted(ResultExecutedContext filterContext) { + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj index 52d210945..e52e98a39 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -66,6 +66,7 @@ + @@ -81,6 +82,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index 8811982c1..82569d2ad 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -1,13 +1,9 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html" %><% Html.RegisterStyle("search.css"); %> -

<%=Html.TitleForPage(T("Search"))%>

<% -using(Html.BeginForm("index", "search", FormMethod.Get, new { @class = "search" })) { %> -
- <%=Html.TextBox("q", Model.Term) %> - -
<% -} +

<%=Html.TitleForPage(T("Search"))%>

+<% +Html.Zone("search"); %><% if (!string.IsNullOrWhiteSpace(Model.Term)) { %>

<%=T("{0} results", Model.Results.Count()) %>

<% diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.ascx new file mode 100644 index 000000000..4dd3ab4c4 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.ascx @@ -0,0 +1,8 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Search.ViewModels" %><% +using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search" })) { %> +
+ <%=Html.TextBox("q", Model.Term) %> + +
<% +} %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Classic/Styles/site.css b/src/Orchard.Web/Themes/Classic/Styles/site.css index 1f1ade327..239ecd460 100644 --- a/src/Orchard.Web/Themes/Classic/Styles/site.css +++ b/src/Orchard.Web/Themes/Classic/Styles/site.css @@ -61,8 +61,14 @@ input[type="text"], #CommentText, #password, #confirmPassword { display: block; padding:3px; width:90%; - } - +} +form.search { + margin-bottom:2em; +} +.search input[type=text] { + display:inline; + width:17em; +} fieldset div {margin:1.6em 0 0 0} legend { diff --git a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx index fe247668c..5c912c41b 100644 --- a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx @@ -33,7 +33,8 @@ <%Html.ZoneBody("content");%>
<%-- End Content --%> <% Html.Include("Footer"); %> From 95c852ca2a73ee6d29a764880bb796eedfe9e06b Mon Sep 17 00:00:00 2001 From: Bertrand Le Roy Date: Thu, 3 Jun 2010 16:22:36 -0700 Subject: [PATCH 13/66] Some corrections to French po file. --HG-- branch : dev --- .../Localization/fr-FR/orchard.core.po | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Orchard.Web/Core/App_Data/Localization/fr-FR/orchard.core.po b/src/Orchard.Web/Core/App_Data/Localization/fr-FR/orchard.core.po index 66a0c6db2..584707fec 100644 --- a/src/Orchard.Web/Core/App_Data/Localization/fr-FR/orchard.core.po +++ b/src/Orchard.Web/Core/App_Data/Localization/fr-FR/orchard.core.po @@ -26,12 +26,12 @@ msgstr "Bienvenue dans Orchard" #: ~/Core/Dashboard/Views/Admin/Index.ascx #| msgid : "The Orchard Team" msgid "The Orchard Team" -msgstr "L'Equipe Orchard" +msgstr "L'équipe Orchard" #: ~/Core/Dashboard/Views/Admin/Index.ascx #| msgid : "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”." msgid "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”." -msgstr "C'est l'endroit pour la gestion de votre site, son apparence et son contenu. Veuillez prendre votre temps explorer le menu à gauche de l'écran pour vous familiariser avec les aspects de l'application. Par exemple, essayez de changer le thème en utilisant le menu “Manage Themes”. Vous pouvez aussi créer de nouvelles pages et gérer les pages existantes via le menu “Manage Pages” ou bien créer des blogs via “Manage Blogs”." +msgstr "Ceci est l'endroit où vous pouvez gérer votre site, son apparence et son contenu. Veuillez passer un instant à explorer le menu à gauche de l'écran pour vous familiariser avec les différents aspects de l'application. Par exemple, vous pouvez changer le thème en utilisant “Gérer les thèmes”. Vous pouvez également créer de nouvelles pages et gérer les pages existantes via “Gérer les pages” ou bien créer de nouveaux blogs via “Gérer les blogs”." #: ~/Core/Dashboard/Views/Admin/Index.ascx #| msgid : "Have fun!" @@ -1801,7 +1801,7 @@ msgstr "Accès refusé" #: ~/Modules/Orchard.Users/Views/Account/AccessDenied.ascx #| msgid : "You do not have permission to complete your request." msgid "You do not have permission to complete your request." -msgstr "Vous n'avez pas la permission de compléter votre requête" +msgstr "Vous n'avez pas la permission de compléter cette requête." #: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx #| msgid : "Change Password" @@ -1811,12 +1811,12 @@ msgstr "Changer le mot de passe" #: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx #| msgid : "Use the form below to change your password." msgid "Use the form below to change your password." -msgstr "Utilisez le forumulaire ci-dessous pour changer votre mot de passe." +msgstr "Veuillez utiliser le forumulaire ci-dessous pour changer votre mot de passe." #: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx #| msgid : "New passwords are required to be a minimum of {0} characters in length." msgid "New passwords are required to be a minimum of {0} characters in length." -msgstr "Les mots de passe doivent contenir {0} charactères au minimum." +msgstr "Les mots de passe doivent contenir au moins {0} caractères." #: ~/Modules/Orchard.Users/Views/Account/ChangePassword.ascx #| msgid : "Current password:" @@ -1856,7 +1856,7 @@ msgstr "La connexion a échoué. Veuillez corriger les erreurs et réessayer." #: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx #| msgid : "Please enter your username and password." msgid "Please enter your username and password." -msgstr "Veuillez saisir votre nom d'utilisateur et mot de passe." +msgstr "Veuillez saisir votre nom d'utilisateur et votre mot de passe." #: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx #| msgid : "Register" @@ -1871,7 +1871,7 @@ msgstr " si vous n'avez pas de compte." #: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx #| msgid : "Account Information" msgid "Account Information" -msgstr "Données de Compte" +msgstr "Données du compte" #: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx #| msgid : "Username or Email:" @@ -1886,7 +1886,7 @@ msgstr "Mot de passe:" #: ~/Modules/Orchard.Users/Views/Account/LogOn.ascx #| msgid : "Remember me?" msgid "Remember me?" -msgstr "Souviens-moi?" +msgstr "Se souvenir de moi?" #: ~/Modules/Orchard.Users/Views/Account/Register.ascx #| msgid : "Create a New Account" @@ -1896,12 +1896,12 @@ msgstr "Créer un nouveau compte utilisateur" #: ~/Modules/Orchard.Users/Views/Account/Register.ascx #| msgid : "Use the form below to create a new account." msgid "Use the form below to create a new account." -msgstr "Utiliser le formulaire ci-dessous pour créer un nouveau compte." +msgstr "Veuillez utiliser le formulaire ci-dessous pour créer un nouveau compte." #: ~/Modules/Orchard.Users/Views/Account/Register.ascx #| msgid : "Passwords are required to be a minimum of {0} characters in length." msgid "Passwords are required to be a minimum of {0} characters in length." -msgstr "Les mots de passe doivent contenir {0} charactères au minimum." +msgstr "Les mots de passe doivent contenir au moins {0} caractères." #: ~/Modules/Orchard.Users/Views/Account/Register.ascx #| msgid : "Username:" @@ -1971,12 +1971,12 @@ msgstr "La connexion a échoué. Veuillez corriger les erreurs et réessayer." #: ~/Themes/Contoso/Views/LogOn.ascx #| msgid : "Please enter your username and password." msgid "Please enter your username and password." -msgstr "Veuillez saisir votre nom d'utilisateur et mot de passe." +msgstr "Veuillez saisir votre nom d'utilisateur et votre mot de passe." #: ~/Themes/Contoso/Views/LogOn.ascx #| msgid : "Register" msgid "Register" -msgstr "Enregistrer" +msgstr "S'enregistrer" #: ~/Themes/Contoso/Views/LogOn.ascx #| msgid : " if you don't have an account." @@ -1986,7 +1986,7 @@ msgstr " si vous n'avez pas de compte." #: ~/Themes/Contoso/Views/LogOn.ascx #| msgid : "Account Information" msgid "Account Information" -msgstr "Données de Compte" +msgstr "Données du Compte" #: ~/Themes/Contoso/Views/LogOn.ascx #| msgid : "Username or Email:" @@ -2001,7 +2001,7 @@ msgstr "Mot de passe:" #: ~/Themes/Contoso/Views/LogOn.ascx #| msgid : "Remember me?" msgid "Remember me?" -msgstr "Souviens-moi?" +msgstr "Se souvenir de moi?" #: ~/Themes/Contoso/Views/User.ascx #| msgid : "Log Off" @@ -2061,12 +2061,12 @@ msgstr "La connexion a échoué. Veuillez corriger les erreurs et réessayer." #: ~/Themes/Corporate/Views/LogOn.ascx #| msgid : "Please enter your username and password." msgid "Please enter your username and password." -msgstr "Veuillez saisir votre nom d'utilisateur et mot de passe." +msgstr "Veuillez saisir votre nom d'utilisateur et votre mot de passe." #: ~/Themes/Corporate/Views/LogOn.ascx #| msgid : "Register" msgid "Register" -msgstr "Enregistrer" +msgstr "S'enregistrer" #: ~/Themes/Corporate/Views/LogOn.ascx #| msgid : " if you don't have an account." @@ -2076,7 +2076,7 @@ msgstr " si vous n'avez pas de compte." #: ~/Themes/Corporate/Views/LogOn.ascx #| msgid : "Account Information" msgid "Account Information" -msgstr "Données de Compte" +msgstr "Données du Compte" #: ~/Themes/Corporate/Views/LogOn.ascx #| msgid : "Username or Email:" @@ -2091,7 +2091,7 @@ msgstr "Mot de passe:" #: ~/Themes/Corporate/Views/LogOn.ascx #| msgid : "Remember me?" msgid "Remember me?" -msgstr "Souviens-moi?" +msgstr "Se souvenir de moi?" #: ~/Themes/Corporate/Views/User.ascx #| msgid : "Log Off" From 6a12f2b710c16c6883845bdc8decf1a9eb2dc57f Mon Sep 17 00:00:00 2001 From: Suha Can Date: Thu, 3 Jun 2010 16:48:49 -0700 Subject: [PATCH 14/66] - Caching parsed cultures and adding file monitors to avoid reparsing. --HG-- branch : dev --- .../Services/DefaultResourceManager.cs | 45 +++++++++++-------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/src/Orchard/Localization/Services/DefaultResourceManager.cs b/src/Orchard/Localization/Services/DefaultResourceManager.cs index aa6fa3482..c85b737c1 100644 --- a/src/Orchard/Localization/Services/DefaultResourceManager.cs +++ b/src/Orchard/Localization/Services/DefaultResourceManager.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.IO; +using Orchard.Caching; using Orchard.Environment.Configuration; using Orchard.Environment.Extensions; using Orchard.FileSystems.WebSite; @@ -11,8 +12,8 @@ namespace Orchard.Localization.Services { private readonly IWebSiteFolder _webSiteFolder; private readonly ICultureManager _cultureManager; private readonly IExtensionManager _extensionManager; + private readonly ICacheManager _cacheManager; private readonly ShellSettings _shellSettings; - private readonly IList _cultures; const string CoreLocalizationFilePathFormat = "/Core/App_Data/Localization/{0}/orchard.core.po"; const string ModulesLocalizationFilePathFormat = "/Modules/{0}/App_Data/Localization/{1}/orchard.module.po"; const string RootLocalizationFilePathFormat = "/App_Data/Localization/{0}/orchard.root.po"; @@ -21,21 +22,20 @@ namespace Orchard.Localization.Services { public DefaultResourceManager( ICultureManager cultureManager, IWebSiteFolder webSiteFolder, - IExtensionManager extensionManager, + IExtensionManager extensionManager, + ICacheManager cacheManager, ShellSettings shellSettings) { _cultureManager = cultureManager; _webSiteFolder = webSiteFolder; _extensionManager = extensionManager; + _cacheManager = cacheManager; _shellSettings = shellSettings; - _cultures = new List(); } public string GetLocalizedString(string scope, string text, string cultureName) { - if (_cultures.Count == 0) { - LoadCultures(); - } + var cultures = LoadCultures(); - foreach (var culture in _cultures) { + foreach (var culture in cultures) { if (String.Equals(cultureName, culture.CultureName, StringComparison.OrdinalIgnoreCase)) { string scopedKey = scope + "|" + text; string genericKey = "|" + text; @@ -46,21 +46,21 @@ namespace Orchard.Localization.Services { return culture.Translations[genericKey]; } - return GetParentTranslation(scope, text, cultureName); + return GetParentTranslation(scope, text, cultureName, cultures); } } return text; } - private string GetParentTranslation(string scope, string text, string cultureName) { + private static string GetParentTranslation(string scope, string text, string cultureName, IEnumerable cultures) { string scopedKey = scope + "|" + text; string genericKey = "|" + text; try { CultureInfo cultureInfo = CultureInfo.GetCultureInfo(cultureName); CultureInfo parentCultureInfo = cultureInfo.Parent; if (parentCultureInfo.IsNeutralCulture) { - foreach (var culture in _cultures) { + foreach (var culture in cultures) { if (String.Equals(parentCultureInfo.Name, culture.CultureName, StringComparison.OrdinalIgnoreCase)) { if (culture.Translations.ContainsKey(scopedKey)) { return culture.Translations[scopedKey]; @@ -78,21 +78,27 @@ namespace Orchard.Localization.Services { return text; } - private void LoadCultures() { - foreach (var culture in _cultureManager.ListCultures()) { - _cultures.Add(new CultureDictionary { - CultureName = culture, - Translations = LoadTranslationsForCulture(culture) - }); - } + private IEnumerable LoadCultures() { + return _cacheManager.Get("cultures", ctx => { + var cultures = new List(); + foreach (var culture in _cultureManager.ListCultures()) { + cultures.Add(new CultureDictionary { + CultureName = culture, + Translations = LoadTranslationsForCulture(culture, ctx) + }); + } + return cultures; + }); + } - private IDictionary LoadTranslationsForCulture(string culture) { + private IDictionary LoadTranslationsForCulture(string culture, AcquireContext context) { IDictionary translations = new Dictionary(); string corePath = string.Format(CoreLocalizationFilePathFormat, culture); string text = _webSiteFolder.ReadFile(corePath); if (text != null) { ParseLocalizationStream(text, translations, false); + context.Monitor(_webSiteFolder.WhenPathChanges(corePath)); } foreach (var module in _extensionManager.AvailableExtensions()) { @@ -101,6 +107,7 @@ namespace Orchard.Localization.Services { text = _webSiteFolder.ReadFile(modulePath); if (text != null) { ParseLocalizationStream(text, translations, true); + context.Monitor(_webSiteFolder.WhenPathChanges(modulePath)); } } } @@ -109,12 +116,14 @@ namespace Orchard.Localization.Services { text = _webSiteFolder.ReadFile(rootPath); if (text != null) { ParseLocalizationStream(text, translations, true); + context.Monitor(_webSiteFolder.WhenPathChanges(rootPath)); } string tenantPath = string.Format(TenantLocalizationFilePathFormat, _shellSettings.Name, culture); text = _webSiteFolder.ReadFile(tenantPath); if (text != null) { ParseLocalizationStream(text, translations, true); + context.Monitor(_webSiteFolder.WhenPathChanges(tenantPath)); } return translations; From 9b57d00d135c12c109a7b2a591d6f96d2ba11fcd Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 3 Jun 2010 16:54:14 -0700 Subject: [PATCH 15/66] Module loading work Adding "App_Data/Extensions" probing path for assembly loading. This directory will be used to store dynamically compiled module assemblies. Adding a BuildProvider for ".csproj" file. This will be used to dynamic compile modules when passing ".csproj" file names to the BuildManager --HG-- branch : dev --- src/Orchard.Web/Web.config | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index 8cef8bee4..3413572ba 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -8,7 +8,8 @@ \Windows\Microsoft.Net\Framework\v2.x\Config --> - + + - + + + + @@ -114,8 +118,9 @@ - - + + + From 2a41a3dedfa8a9be19406c9ddf7ba17d04fd397a Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 3 Jun 2010 16:57:44 -0700 Subject: [PATCH 16/66] Remove implicit conversion from LocalizedString to string Having both way implicit conversion tend to confuse the C# compiler and really question the existence of the specific type in the first place. --HG-- branch : dev --- src/Orchard/Commands/DefaultOrchardCommandHandler.cs | 6 +++--- src/Orchard/Environment/Extensions/ExtensionManager.cs | 2 +- src/Orchard/Localization/LocalizedString.cs | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Orchard/Commands/DefaultOrchardCommandHandler.cs b/src/Orchard/Commands/DefaultOrchardCommandHandler.cs index 1242227e4..5e591d205 100644 --- a/src/Orchard/Commands/DefaultOrchardCommandHandler.cs +++ b/src/Orchard/Commands/DefaultOrchardCommandHandler.cs @@ -45,7 +45,7 @@ namespace Orchard.Commands { propertyInfo.SetValue(this, stringValue, null); } else { - throw new InvalidOperationException(T("No property named {0} found of type bool, int or string.", commandSwitch)); + throw new InvalidOperationException(T("No property named {0} found of type bool, int or string.", commandSwitch).ToString()); } } } @@ -55,7 +55,7 @@ namespace Orchard.Commands { CheckMethodForSwitches(context.CommandDescriptor.MethodInfo, context.Switches); object[] invokeParameters = GetInvokeParametersForMethod(context.CommandDescriptor.MethodInfo, (context.Arguments ?? Enumerable.Empty()).ToArray()); if (invokeParameters == null) { - throw new InvalidOperationException(T("Command arguments don't match")); + throw new InvalidOperationException(T("Command arguments don't match").ToString()); } this.Context = context; @@ -105,7 +105,7 @@ namespace Orchard.Commands { } foreach (var commandSwitch in switches.Keys) { if (!supportedSwitches.Contains(commandSwitch)) { - throw new InvalidOperationException(T("Method {0} does not support switch {1}.", methodInfo.Name, commandSwitch)); + throw new InvalidOperationException(T("Method {0} does not support switch {1}.", methodInfo.Name, commandSwitch).ToString()); } } } diff --git a/src/Orchard/Environment/Extensions/ExtensionManager.cs b/src/Orchard/Environment/Extensions/ExtensionManager.cs index 7fba8f53e..bf05612ba 100644 --- a/src/Orchard/Environment/Extensions/ExtensionManager.cs +++ b/src/Orchard/Environment/Extensions/ExtensionManager.cs @@ -53,7 +53,7 @@ namespace Orchard.Environment.Extensions { private Feature LoadFeature(FeatureDescriptor featureDescriptor) { var featureName = featureDescriptor.Name; string extensionName = GetExtensionForFeature(featureName); - if (extensionName == null) throw new ArgumentException(T("Feature {0} was not found in any of the installed extensions", featureName)); + if (extensionName == null) throw new ArgumentException(T("Feature {0} was not found in any of the installed extensions", featureName).ToString()); var extension = BuildActiveExtensions().Where(x => x.Descriptor.Name == extensionName).FirstOrDefault(); if (extension == null) throw new InvalidOperationException(T("Extension ") + extensionName + T(" is not active")); diff --git a/src/Orchard/Localization/LocalizedString.cs b/src/Orchard/Localization/LocalizedString.cs index a9bd2d934..bd5f94b1f 100644 --- a/src/Orchard/Localization/LocalizedString.cs +++ b/src/Orchard/Localization/LocalizedString.cs @@ -16,10 +16,6 @@ namespace Orchard.Localization { return _localized; } - public static implicit operator string(LocalizedString x) { - return x._localized; - } - public override int GetHashCode() { var hashCode = 0; if (_localized != null) From d24f4cf2ac470f57e165f9c2568b639a3987671d Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 3 Jun 2010 16:57:58 -0700 Subject: [PATCH 17/66] Fix identation --HG-- branch : dev --- .../Environment/Extensions/Loaders/AreaExtensionLoader.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Orchard/Environment/Extensions/Loaders/AreaExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/AreaExtensionLoader.cs index 7168eb034..181c32dbf 100644 --- a/src/Orchard/Environment/Extensions/Loaders/AreaExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/AreaExtensionLoader.cs @@ -12,10 +12,10 @@ namespace Orchard.Environment.Extensions.Loaders { var assembly = Assembly.Load("Orchard.Web"); return new ExtensionEntry { - Descriptor = descriptor, - Assembly = assembly, - ExportedTypes = assembly.GetExportedTypes().Where(x => IsTypeFromModule(x, descriptor)) - }; + Descriptor = descriptor, + Assembly = assembly, + ExportedTypes = assembly.GetExportedTypes().Where(x => IsTypeFromModule(x, descriptor)) + }; } return null; } From abe6c67b259e9fe34d6eeb40a7f71ea8db14c4be Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 3 Jun 2010 17:00:28 -0700 Subject: [PATCH 18/66] Implement dynamic compilation of modules --HG-- branch : dev --- .../Loaders/CSharpExtensionBuildProvider.cs | 21 +++++ .../Loaders/CSharpExtensionCompiler.cs | 47 ++++++++++ .../Loaders/CSharpProjectFullTrustCompiler.cs | 50 +++++++++++ .../CSharpProjectMediumTrustCompiler.cs | 52 +++++++++++ .../Extensions/Loaders/CSharpProjectParser.cs | 48 ++++++++++ .../Loaders/DynamicExtensionLoader.cs | 90 ++++++++++--------- .../Extensions/Loaders/IAssemblyBuilder.cs | 22 +++++ .../Extensions/Loaders/IBuildManager.cs | 16 ++++ .../Loaders/IVirtualPathProvider.cs | 30 +++++++ src/Orchard/Orchard.Framework.csproj | 9 ++ 10 files changed, 345 insertions(+), 40 deletions(-) create mode 100644 src/Orchard/Environment/Extensions/Loaders/CSharpExtensionBuildProvider.cs create mode 100644 src/Orchard/Environment/Extensions/Loaders/CSharpExtensionCompiler.cs create mode 100644 src/Orchard/Environment/Extensions/Loaders/CSharpProjectFullTrustCompiler.cs create mode 100644 src/Orchard/Environment/Extensions/Loaders/CSharpProjectMediumTrustCompiler.cs create mode 100644 src/Orchard/Environment/Extensions/Loaders/CSharpProjectParser.cs create mode 100644 src/Orchard/Environment/Extensions/Loaders/IAssemblyBuilder.cs create mode 100644 src/Orchard/Environment/Extensions/Loaders/IBuildManager.cs create mode 100644 src/Orchard/Environment/Extensions/Loaders/IVirtualPathProvider.cs diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionBuildProvider.cs b/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionBuildProvider.cs new file mode 100644 index 000000000..92ce7357f --- /dev/null +++ b/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionBuildProvider.cs @@ -0,0 +1,21 @@ +using System.Web.Compilation; + +namespace Orchard.Environment.Extensions.Loaders { + public class CSharpExtensionBuildProvider : BuildProvider { + private readonly CompilerType _codeCompilerType; + + public CSharpExtensionBuildProvider() { + _codeCompilerType = GetDefaultCompilerTypeForLanguage("C#"); + } + + public override CompilerType CodeCompilerType { get { return _codeCompilerType; } } + + public override void GenerateCode(AssemblyBuilder assemblyBuilder) { + var virtualPathProvider = new AspNetVirtualPathProvider(); + var compiler = new CSharpProjectMediumTrustCompiler(virtualPathProvider); + + var aspNetAssemblyBuilder = new AspNetAssemblyBuilder(assemblyBuilder, this); + compiler.CompileProject(this.VirtualPath, aspNetAssemblyBuilder); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionCompiler.cs b/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionCompiler.cs new file mode 100644 index 000000000..b4f6d380a --- /dev/null +++ b/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionCompiler.cs @@ -0,0 +1,47 @@ +using System.CodeDom.Compiler; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Web.Compilation; +using System.Web.Hosting; + +namespace Orchard.Environment.Extensions.Loaders { + /// + /// Compile a C# extension into an assembly given a directory location + /// + public class CSharpExtensionCompiler { + public CompilerResults CompileProject(string location) { + var codeProvider = CodeDomProvider.CreateProvider("cs"); + + var references = GetAssemblyReferenceNames(); + var options = new CompilerParameters(references.ToArray()); + + var fileNames = GetSourceFileNames(location); + var results = codeProvider.CompileAssemblyFromFile(options, fileNames.ToArray()); + return results; + } + + private IEnumerable GetAssemblyReferenceNames() { + return Enumerable.Distinct(BuildManager.GetReferencedAssemblies() + .OfType() + .Select(x => x.Location) + .Where(x => !string.IsNullOrEmpty(x))); + } + + private IEnumerable GetSourceFileNames(string path) { + foreach (var file in Directory.GetFiles(path, "*.cs")) { + yield return file; + } + + foreach (var folder in Directory.GetDirectories(path)) { + if (Path.GetFileName(folder).StartsWith(".")) + continue; + + foreach (var file in GetSourceFileNames(folder)) { + yield return file; + } + } + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpProjectFullTrustCompiler.cs b/src/Orchard/Environment/Extensions/Loaders/CSharpProjectFullTrustCompiler.cs new file mode 100644 index 000000000..4977434a2 --- /dev/null +++ b/src/Orchard/Environment/Extensions/Loaders/CSharpProjectFullTrustCompiler.cs @@ -0,0 +1,50 @@ +using System.CodeDom.Compiler; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; + +namespace Orchard.Environment.Extensions.Loaders { + /// + /// Compile a C# extension into an assembly given a directory location + /// + public class CSharpProjectFullTrustCompiler { + private readonly IVirtualPathProvider _virtualPathProvider; + private readonly IBuildManager _buildManager; + + public CSharpProjectFullTrustCompiler(IVirtualPathProvider virtualPathProvider, IBuildManager buildManager) { + _virtualPathProvider = virtualPathProvider; + _buildManager = buildManager; + } + + /// + /// Compile a csproj file given its virtual path. Use the CSharp CodeDomProvider + /// class, which is only available in full trust. + /// + public CompilerResults CompileProject(string virtualPath) { + var codeProvider = CodeDomProvider.CreateProvider("cs"); + var directory = _virtualPathProvider.GetDirectoryName(virtualPath); + + using (var stream = _virtualPathProvider.OpenFile(virtualPath)) { + var descriptor = new CSharpProjectParser().Parse(stream); + + var references = GetAssemblyReferenceNames(); + var options = new CompilerParameters(references.ToArray()); + + var fileNames = descriptor.SourceFilenames + .Select(f => _virtualPathProvider.Combine(directory, f)) + .Select(f => _virtualPathProvider.MapPath(f)); + + var results = codeProvider.CompileAssemblyFromFile(options, fileNames.ToArray()); + return results; + } + } + + private IEnumerable GetAssemblyReferenceNames() { + return _buildManager.GetReferencedAssemblies() + .OfType() + .Where(a => !string.IsNullOrEmpty(a.Location)) + .Select(a => a.Location) + .Distinct(); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpProjectMediumTrustCompiler.cs b/src/Orchard/Environment/Extensions/Loaders/CSharpProjectMediumTrustCompiler.cs new file mode 100644 index 000000000..b8d611d6e --- /dev/null +++ b/src/Orchard/Environment/Extensions/Loaders/CSharpProjectMediumTrustCompiler.cs @@ -0,0 +1,52 @@ +using System; +using System.CodeDom; +using System.IO; +using System.Linq; + + +namespace Orchard.Environment.Extensions.Loaders { + /// + /// Compile a C# extension into an assembly given a directory location + /// + public class CSharpProjectMediumTrustCompiler { + private readonly IVirtualPathProvider _virtualPathProvider; + + public CSharpProjectMediumTrustCompiler(IVirtualPathProvider virtualPathProvider) { + _virtualPathProvider = virtualPathProvider; + } + /// + /// Compile a csproj file given its virtual path, a build provider and an assembly builder. + /// This method works in medium trust. + /// + public void CompileProject(string virtualPath, IAssemblyBuilder assemblyBuilder) { + using (var stream = _virtualPathProvider.OpenFile(virtualPath)) { + var descriptor = new CSharpProjectParser().Parse(stream); + + var directory = _virtualPathProvider.GetDirectoryName(virtualPath); + foreach (var filename in descriptor.SourceFilenames.Select(f => _virtualPathProvider.Combine(directory, f))) { + assemblyBuilder.AddCodeCompileUnit(CreateCompileUnit(filename)); + } + } + } + + private CodeCompileUnit CreateCompileUnit(string virtualPath) { + var contents = GetContents(virtualPath); + var unit = new CodeSnippetCompileUnit(contents); + var physicalPath = _virtualPathProvider.MapPath(virtualPath); + if (!string.IsNullOrEmpty(physicalPath)) { + unit.LinePragma = new CodeLinePragma(physicalPath, 1); + } + return unit; + } + + private string GetContents(string virtualPath) { + string contents; + using (var stream = _virtualPathProvider.OpenFile(virtualPath)) { + using (var reader = new StreamReader(stream)) { + contents = reader.ReadToEnd(); + } + } + return contents; + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpProjectParser.cs b/src/Orchard/Environment/Extensions/Loaders/CSharpProjectParser.cs new file mode 100644 index 000000000..d367c0886 --- /dev/null +++ b/src/Orchard/Environment/Extensions/Loaders/CSharpProjectParser.cs @@ -0,0 +1,48 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml; +using System.Xml.Linq; + +namespace Orchard.Environment.Extensions.Loaders { + public class CSharpProjectDescriptor { + public IEnumerable SourceFilenames { get; set; } + public IEnumerable References { get; set; } + } + + public class ReferenceDescriptor { + public string AssemblyName { get; set; } + } + + public class CSharpProjectParser { + public CSharpProjectDescriptor Parse(Stream stream) { + var document = XDocument.Load(XmlReader.Create(stream)); + return new CSharpProjectDescriptor { + SourceFilenames = GetSourceFilenames(document), + References = GetReferences(document) + }; + } + + private IEnumerable GetSourceFilenames(XDocument document) { + return document + .Elements(ns("Project")) + .Elements(ns("ItemGroup")) + .Elements(ns("Compile")) + .Attributes("Include") + .Select(c => c.Value); + } + + private IEnumerable GetReferences(XDocument document) { + return document + .Elements(ns("Project")) + .Elements(ns("ItemGroup")) + .Elements(ns("Reference")) + .Attributes("Include") + .Select(c => new ReferenceDescriptor { AssemblyName = c.Value }); + } + + private static XName ns(string name) { + return XName.Get(name, "http://schemas.microsoft.com/developer/msbuild/2003"); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs index 3178d2780..64ca1a891 100644 --- a/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs @@ -1,7 +1,5 @@ -using System.CodeDom.Compiler; -using System.Collections.Generic; +using System; using System.IO; -using System.Linq; using System.Reflection; using System.Web.Compilation; using System.Web.Hosting; @@ -15,45 +13,57 @@ namespace Orchard.Environment.Extensions.Loaders { if (HostingEnvironment.IsHosted == false) return null; - var codeProvider = CodeDomProvider.CreateProvider("cs"); - - var references = GetAssemblyReferenceNames(); - var options = new CompilerParameters(references.ToArray()); - - var locationPath = HostingEnvironment.MapPath(descriptor.Location); - var extensionPath = Path.Combine(locationPath, descriptor.Name); - - var fileNames = GetSourceFileNames(extensionPath); - var results = codeProvider.CompileAssemblyFromFile(options, fileNames.ToArray()); - - return new ExtensionEntry { - Descriptor = descriptor, - Assembly = results.CompiledAssembly, - ExportedTypes = results.CompiledAssembly.GetExportedTypes(), - }; - } - - private IEnumerable GetAssemblyReferenceNames() { - return BuildManager.GetReferencedAssemblies() - .OfType() - .Select(x => x.Location) - .Where(x => !string.IsNullOrEmpty(x)) - .Distinct(); - } - - private IEnumerable GetSourceFileNames(string path) { - foreach (var file in Directory.GetFiles(path, "*.cs")) { - yield return file; - } - - foreach (var folder in Directory.GetDirectories(path)) { - if (Path.GetFileName(folder).StartsWith(".")) - continue; - - foreach (var file in GetSourceFileNames(folder)) { - yield return file; + // 1) Try to load the assembly directory + // This will look in the "App_Data/Dependencies" directory if + // the probing path is correctly configured in Web.config + { + try { + Assembly assembly = Assembly.Load(descriptor.Name); + return CreateExtensionEntry(descriptor, assembly); + } + catch (FileNotFoundException e) { + // The assembly is not in one of the probing directory, + // including "App_Data/Dependencies", we need to move on + // to other strageties } } + + // 2) look for the assembly in the "Bin" directory + { + string modulePath = HostingEnvironment.MapPath(descriptor.Location); + modulePath = Path.Combine(modulePath, descriptor.Name); + string moduleBinary = Path.Combine(modulePath, "bin"); + moduleBinary = Path.Combine(moduleBinary, descriptor.Name + ".dll"); + if (File.Exists(moduleBinary)) { + // Copy file to dependencies directory + string dependenciesPath = HostingEnvironment.MapPath("~/App_Data/Dependencies"); + if (!Directory.Exists(dependenciesPath)) { + Directory.CreateDirectory(dependenciesPath); + } + string destFile = Path.Combine(dependenciesPath, descriptor.Name + ".dll"); + File.Copy(moduleBinary, destFile, true); + + // then load the assembly + Assembly assembly = Assembly.Load(descriptor.Name); + return CreateExtensionEntry(descriptor, assembly); + } + } + + // 3) look for the csproj in the module directory + { + string projfileName = Path.Combine(descriptor.Location, descriptor.Name); + projfileName = Path.Combine(projfileName, descriptor.Name + ".csproj").Replace('\\', '/'); + var assembly = BuildManager.GetCompiledAssembly(projfileName); + return CreateExtensionEntry(descriptor, assembly); + } + } + + private static ExtensionEntry CreateExtensionEntry(ExtensionDescriptor descriptor, Assembly assembly) { + return new ExtensionEntry { + Descriptor = descriptor, + Assembly = assembly, + ExportedTypes = assembly.GetExportedTypes(), + }; } } } \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/IAssemblyBuilder.cs b/src/Orchard/Environment/Extensions/Loaders/IAssemblyBuilder.cs new file mode 100644 index 000000000..b2e434f33 --- /dev/null +++ b/src/Orchard/Environment/Extensions/Loaders/IAssemblyBuilder.cs @@ -0,0 +1,22 @@ +using System.CodeDom; +using System.Web.Compilation; + +namespace Orchard.Environment.Extensions.Loaders { + public interface IAssemblyBuilder { + void AddCodeCompileUnit(CodeCompileUnit compileUnit); + } + + public class AspNetAssemblyBuilder : IAssemblyBuilder { + private readonly AssemblyBuilder _assemblyBuilder; + private readonly BuildProvider _buildProvider; + + public AspNetAssemblyBuilder(AssemblyBuilder assemblyBuilder, BuildProvider buildProvider) { + _assemblyBuilder = assemblyBuilder; + _buildProvider = buildProvider; + } + + public void AddCodeCompileUnit(CodeCompileUnit compileUnit) { + _assemblyBuilder.AddCodeCompileUnit(_buildProvider, compileUnit); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/IBuildManager.cs b/src/Orchard/Environment/Extensions/Loaders/IBuildManager.cs new file mode 100644 index 000000000..af638f9d6 --- /dev/null +++ b/src/Orchard/Environment/Extensions/Loaders/IBuildManager.cs @@ -0,0 +1,16 @@ +using System; +using System.Linq; +using System.Collections.Generic; +using System.Web.Compilation; + +namespace Orchard.Environment.Extensions.Loaders { + public interface IBuildManager { + IEnumerable GetReferencedAssemblies(); + } + + public class AspNetBuildManager : IBuildManager { + public IEnumerable GetReferencedAssemblies() { + return BuildManager.GetReferencedAssemblies().Cast(); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/IVirtualPathProvider.cs b/src/Orchard/Environment/Extensions/Loaders/IVirtualPathProvider.cs new file mode 100644 index 000000000..79f7d0a9e --- /dev/null +++ b/src/Orchard/Environment/Extensions/Loaders/IVirtualPathProvider.cs @@ -0,0 +1,30 @@ +using System; +using System.IO; +using System.Web.Hosting; + +namespace Orchard.Environment.Extensions.Loaders { + public interface IVirtualPathProvider { + string GetDirectoryName(string virtualPath); + string Combine(params string[] paths); + Stream OpenFile(string virtualPath); + string MapPath(string virtualPath); + } + + public class AspNetVirtualPathProvider : IVirtualPathProvider { + public string GetDirectoryName(string virtualPath) { + return Path.GetDirectoryName(virtualPath); + } + + public string Combine(params string[] paths) { + return Path.Combine(paths).Replace('\\', '/'); + } + + public Stream OpenFile(string virtualPath) { + return VirtualPathProvider.OpenFile(virtualPath); + } + + public string MapPath(string virtualPath) { + return HostingEnvironment.MapPath(virtualPath); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index f43d1f4af..1712e764a 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -119,6 +119,7 @@ 3.5 + False ..\..\lib\yaml\Yaml.dll @@ -135,6 +136,14 @@ + + + + + + + + From a712d04743fcba3eacc8d34ad77f47d7e40e0a68 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Thu, 3 Jun 2010 17:06:19 -0700 Subject: [PATCH 19/66] - Comment in the websitefolder to remind me to fix a bug in directory monitoring. --HG-- branch : dev --- src/Orchard/FileSystems/WebSite/WebSiteFolder.cs | 1 + src/Orchard/Localization/Services/DefaultCultureManager.cs | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard/FileSystems/WebSite/WebSiteFolder.cs b/src/Orchard/FileSystems/WebSite/WebSiteFolder.cs index 14543853f..d82eec4f9 100644 --- a/src/Orchard/FileSystems/WebSite/WebSiteFolder.cs +++ b/src/Orchard/FileSystems/WebSite/WebSiteFolder.cs @@ -43,6 +43,7 @@ namespace Orchard.FileSystems.WebSite { } public IVolatileToken WhenPathChanges(string virtualPath) { + // Fix this to monitor first existing parent directory. var token = BindToken(virtualPath); BindSignal(virtualPath); return token; diff --git a/src/Orchard/Localization/Services/DefaultCultureManager.cs b/src/Orchard/Localization/Services/DefaultCultureManager.cs index 8983636d0..36a48f445 100644 --- a/src/Orchard/Localization/Services/DefaultCultureManager.cs +++ b/src/Orchard/Localization/Services/DefaultCultureManager.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using System.Web; -using System.Web.Routing; using Orchard.Data; using Orchard.Localization.Records; From cac40c37a6ce297562ad5c6347a2eb5ee34bab23 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 3 Jun 2010 17:40:33 -0700 Subject: [PATCH 20/66] Modified DefaultContentManager to trigger Publishing handlers when Create() is called with Version.Publish argument --HG-- branch : dev --- .../ContentManagement/DefaultContentManager.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Orchard/ContentManagement/DefaultContentManager.cs b/src/Orchard/ContentManagement/DefaultContentManager.cs index ee99a3716..06b77b4d3 100644 --- a/src/Orchard/ContentManagement/DefaultContentManager.cs +++ b/src/Orchard/ContentManagement/DefaultContentManager.cs @@ -336,6 +336,20 @@ namespace Orchard.ContentManagement { foreach (var handler in Handlers) { handler.Created(context); } + + if(options.IsPublished) { + var publishContext = new PublishContentContext(contentItem, null); + + // invoke handlers to acquire state, or at least establish lazy loading callbacks + foreach ( var handler in Handlers ) { + handler.Publishing(publishContext); + } + + // invoke handlers to acquire state, or at least establish lazy loading callbacks + foreach ( var handler in Handlers ) { + handler.Published(publishContext); + } + } } public ContentItemMetadata GetItemMetadata(IContent content) { From 727647a043cccb54c5c506453b8b41e05bf9ee7b Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 3 Jun 2010 17:41:04 -0700 Subject: [PATCH 21/66] Added Blog commands (Create, Import) --HG-- branch : dev --- .../Orchard.Blogs/Commands/BlogCommands.cs | 128 ++++++++++++++++++ .../Modules/Orchard.Blogs/Models/Blog.cs | 1 + .../Orchard.Blogs/Orchard.Blogs.csproj | 1 + 3 files changed, 130 insertions(+) create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs new file mode 100644 index 000000000..8456fc929 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs @@ -0,0 +1,128 @@ +using System; +using System.Linq; +using System.Text.RegularExpressions; +using System.Xml.Linq; +using Orchard.Blogs.Models; +using Orchard.Commands; +using Orchard.ContentManagement; +using Orchard.ContentManagement.Aspects; +using Orchard.Core.Common.Models; +using Orchard.Core.Navigation.Models; +using Orchard.Security; +using System.IO; +using Orchard.Blogs.Services; +using Orchard.Core.Navigation.Services; + +namespace Orchard.Blogs.Commands { + public class BlogCommands : DefaultOrchardCommandHandler { + private readonly IContentManager _contentManager; + private readonly IMembershipService _membershipService; + private readonly IBlogService _blogService; + private readonly IMenuService _menuService; + + public BlogCommands( + IContentManager contentManager, + IMembershipService membershipService, + IBlogService blogService, + IMenuService menuService) { + _contentManager = contentManager; + _membershipService = membershipService; + _blogService = blogService; + _menuService = menuService; + } + + [OrchardSwitch] + public string FeedUrl { get; set; } + + [OrchardSwitch] + public string Slug { get; set; } + + [OrchardSwitch] + public string Title { get; set; } + + [OrchardSwitch] + public string MenuText { get; set; } + + [CommandName("blog create")] + [CommandHelp("blog create /Slug: /Title: [/MenuText:<menu text>]\r\n\t" + "Creates a new Blog")] + [OrchardSwitches("Slug,Title,MenuText")] + public string Create() { + var admin = _membershipService.GetUser("admin"); + + if(!IsSlugValid(Slug)) { + return "Invalid Slug provided. Blog creation failed."; + } + + var blog = _contentManager.New("blog"); + blog.As<ICommonAspect>().Owner = admin; + blog.As<RoutableAspect>().Slug = Slug; + blog.As<RoutableAspect>().Title = Title; + if ( !String.IsNullOrWhiteSpace(MenuText) ) { + blog.As<MenuPart>().OnMainMenu = true; + blog.As<MenuPart>().MenuPosition = _menuService.Get().Select(menuPart => menuPart.MenuPosition).Max() + 1 + ".0"; + blog.As<MenuPart>().MenuText = MenuText; + } + _contentManager.Create(blog); + + return "Blog created successfully"; + } + + [CommandName("blog import")] + [CommandHelp("blog import /Slug:<slug> /FeedUrl:<feed url>\r\n\t" + "Import all items from <feed url> into the blog at the specified <slug>")] + [OrchardSwitches("FeedUrl,Slug")] + public string Import() { + var admin = _membershipService.GetUser("admin"); + + XDocument doc; + + try { + Context.Output.WriteLine("Loading feed..."); + doc = XDocument.Load(FeedUrl); + Context.Output.WriteLine("Found {0} items", doc.Descendants("item").Count()); + } + catch ( Exception ex ) { + Context.Output.WriteLine(T("An error occured while loading the file: " + ex.Message)); + return "Import terminated."; + } + + var blog = _blogService.Get(Slug); + + if ( blog == null ) { + return "Blog not found at specified slug: " + Slug; + } + + foreach ( var item in doc.Descendants("item") ) { + string postName = item.Element("title").Value; + + Context.Output.WriteLine("Adding post: {0}...", postName.Substring(0, Math.Min(postName.Length, 40))); + var post = _contentManager.New("blogpost"); + post.As<ICommonAspect>().Owner = admin; + post.As<ICommonAspect>().Container = blog; + post.As<RoutableAspect>().Slug = Slugify(postName); + post.As<RoutableAspect>().Title = postName; + post.As<BodyAspect>().Text = item.Element("description").Value; + _contentManager.Create(post); + } + + + return "Import feed completed."; + } + + private static string Slugify(string slug) { + var dissallowed = new Regex(@"[/:?#\[\]@!$&'()*+,;=\s]+"); + + slug = dissallowed.Replace(slug, "-"); + slug = slug.Trim('-'); + + if ( slug.Length > 1000 ) + slug = slug.Substring(0, 1000); + + return slug.ToLowerInvariant(); + } + + private static bool IsSlugValid(string slug) { + // see http://tools.ietf.org/html/rfc3987 for prohibited chars + return slug == null || String.IsNullOrEmpty(slug.Trim()) || Regex.IsMatch(slug, @"^[^/:?#\[\]@!$&'()*+,;=\s]+$"); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Models/Blog.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Models/Blog.cs index 75362ec5f..9b80f4001 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Models/Blog.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Models/Blog.cs @@ -9,6 +9,7 @@ namespace Orchard.Blogs.Models { public string Name { get { return this.As<RoutableAspect>().Title; } + set { this.As<RoutableAspect>().Title = value; } } //TODO: (erikpo) Need a data type for slug diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index 2df26fa98..a27f9f0af 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -66,6 +66,7 @@ </ItemGroup> <ItemGroup> <Compile Include="AdminMenu.cs" /> + <Compile Include="Commands\BlogCommands.cs" /> <Compile Include="Controllers\BlogAdminController.cs" /> <Compile Include="Drivers\BlogDriver.cs" /> <Compile Include="Controllers\BlogPostAdminController.cs" /> From 784f9dfc09499c312cdab2d25ab0b2e82cd069d3 Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Fri, 4 Jun 2010 08:35:24 -0700 Subject: [PATCH 22/66] Gave search a friendly URL (/search) - and changed the property on the view model from Term to Query (sounds better and goes with the 'q' param) --HG-- branch : dev --- .../Controllers/SearchController.cs | 2 +- .../Orchard.Search/Orchard.Search.csproj | 1 + .../Modules/Orchard.Search/Routes.cs | 34 +++++++++++++++++++ .../ViewModels/SearchViewModel.cs | 3 +- .../Orchard.Search/Views/Search/Index.ascx | 2 +- .../Orchard.Search/Views/SearchForm.ascx | 2 +- 6 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Routes.cs diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs index 5a535a4f2..8e4e4e45a 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -15,7 +15,7 @@ namespace Orchard.Search.Controllers { } public ActionResult Index(string q) { - var searchViewModel = new SearchViewModel {Term = q}; + var searchViewModel = new SearchViewModel {Query = q}; var results = _searchService.Query(q); searchViewModel.Results = results.Select(result => new SearchResultViewModel { diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj index e52e98a39..770b58c82 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -67,6 +67,7 @@ <ItemGroup> <Compile Include="Controllers\SearchController.cs" /> <Compile Include="Filters\SearchFilter.cs" /> + <Compile Include="Routes.cs" /> <Compile Include="Services\ISearchService.cs" /> <Compile Include="Services\SearchService.cs" /> <Compile Include="ViewModels\SearchResultViewModel.cs" /> diff --git a/src/Orchard.Web/Modules/Orchard.Search/Routes.cs b/src/Orchard.Web/Modules/Orchard.Search/Routes.cs new file mode 100644 index 000000000..f26c20a65 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Routes.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Web.Mvc; +using System.Web.Routing; +using Orchard.Mvc.Routes; + +namespace Orchard.Search { + public class Routes : IRouteProvider { + + public void GetRoutes(ICollection<RouteDescriptor> routes) { + foreach (var routeDescriptor in GetRoutes()) + routes.Add(routeDescriptor); + } + + public IEnumerable<RouteDescriptor> GetRoutes() { + return new[] { + new RouteDescriptor { + Priority = 5, + Route = new Route( + "Search", + new RouteValueDictionary { + {"area", "Orchard.Search"}, + {"controller", "search"}, + {"action", "index"} + }, + null, + new RouteValueDictionary { + {"area", "Orchard.Search"} + }, + new MvcRouteHandler()) + } + }; + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs index c01903cf8..0ccfa956e 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; -using Orchard.Indexing; using Orchard.Mvc.ViewModels; namespace Orchard.Search.ViewModels { public class SearchViewModel : BaseViewModel { public IEnumerable<SearchResultViewModel> Results { get; set; } - public string Term { get; set; } + public string Query { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index 82569d2ad..415dab029 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -5,7 +5,7 @@ Html.RegisterStyle("search.css"); %> <% Html.Zone("search"); %><% -if (!string.IsNullOrWhiteSpace(Model.Term)) { %> +if (!string.IsNullOrWhiteSpace(Model.Query)) { %> <p class="search-summary"><%=T("<em>{0}</em> results", Model.Results.Count()) %></p><% } diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.ascx index 4dd3ab4c4..b1df13ea6 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.ascx @@ -2,7 +2,7 @@ <%@ Import Namespace="Orchard.Search.ViewModels" %><% using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search" })) { %> <fieldset> - <%=Html.TextBox("q", Model.Term) %> + <%=Html.TextBox("q", Model.Query) %> <button type="submit"><%=T("Search") %></button> </fieldset><% } %> \ No newline at end of file From 2719f2e52cdfe8a9fce33c80d1f8bebad455a8d9 Mon Sep 17 00:00:00 2001 From: Suha Can <Suha.Can@microsoft.com> Date: Fri, 4 Jun 2010 11:01:34 -0700 Subject: [PATCH 23/66] - Commenting the resource manager. --HG-- branch : dev --- .../Services/DefaultResourceManager.cs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/Orchard/Localization/Services/DefaultResourceManager.cs b/src/Orchard/Localization/Services/DefaultResourceManager.cs index c85b737c1..3f0871041 100644 --- a/src/Orchard/Localization/Services/DefaultResourceManager.cs +++ b/src/Orchard/Localization/Services/DefaultResourceManager.cs @@ -32,6 +32,12 @@ namespace Orchard.Localization.Services { _shellSettings = shellSettings; } + // This will translate a string into a string in the target cultureName. + // The scope portion is optional, it amounts to the location of the file containing + // the string in case it lives in a view, or the namespace name if the string lives in a binary. + // If the culture doesn't have a translation for the string, it will fallback to the + // parent culture as defined in the .net culture hierarchy. e.g. fr-FR will fallback to fr. + // In case it's not found anywhere, the text is returned as is. public string GetLocalizedString(string scope, string text, string cultureName) { var cultures = LoadCultures(); @@ -78,6 +84,9 @@ namespace Orchard.Localization.Services { return text; } + // Loads the culture dictionaries in memory and caches them. + // Cache entry will be invalidated any time the directories hosting + // the .po files are modified. private IEnumerable<CultureDictionary> LoadCultures() { return _cacheManager.Get("cultures", ctx => { var cultures = new List<CultureDictionary>(); @@ -92,6 +101,16 @@ namespace Orchard.Localization.Services { } + // Merging occurs from multiple locations: + // In reverse priority order: + // "/Core/App_Data/Localization/<culture_name>/orchard.core.po"; + // "/Modules/<module_name>/App_Data/Localization/<culture_name>/orchard.module.po"; + // "/App_Data/Localization/<culture_name>/orchard.root.po"; + // "/App_Data/Sites/<tenant_name>/Localization/<culture_name>/orchard.po"; + // The dictionary entries from po files that live in higher priority locations will + // override the ones from lower priority locations during loading of dictionaries. + + // TODO: Add culture name in the po file name to facilitate usage. private IDictionary<string, string> LoadTranslationsForCulture(string culture, AcquireContext<string> context) { IDictionary<string, string> translations = new Dictionary<string, string>(); string corePath = string.Format(CoreLocalizationFilePathFormat, culture); From 83f1de1fc926af735bf92b641e25dcbace8f66b8 Mon Sep 17 00:00:00 2001 From: Louis DeJardin <Louis.DeJardin@microsoft.com> Date: Fri, 4 Jun 2010 13:37:34 -0700 Subject: [PATCH 24/66] Adding fields to metadata definitions Refactoring some component and record names Made content definition model immutable, with builder pattern for creation and alteration Moving records and storage out of base framework assembly Splitting into separate ContentTypeRecord and ContentTypeDefinitionRecord Changing MetaData module's MetaDataController to AdminController Introduced a ContentHandlerBase : IContentHandler to provide virtual no-op implementation of fairly large interface --HG-- branch : dev --- .../Providers/CommonAspectProviderTests.cs | 3 - .../Common/Services/RoutableServiceTests.cs | 3 - .../Orchard.Core.Tests.csproj | 1 + .../Scheduling/ScheduledTaskExecutorTests.cs | 3 - .../Scheduling/ScheduledTaskManagerTests.cs | 3 - .../Metadata/ContentDefinitionManagerTests.cs | 211 +++++++++++++ .../Users/Controllers/AdminControllerTests.cs | 3 - .../Users/Services/MembershipServiceTests.cs | 5 +- .../ContentManagement/ContentQueryTests.cs | 5 +- .../ContentTypeMetaDataTests.cs | 62 ---- .../DefaultContentManagerTests.cs | 3 - .../ContentTypeDefinitionBuilderTests.cs | 130 ++++++++ .../Orchard.Framework.Tests.csproj | 2 +- src/Orchard.Web/Core/Orchard.Core.csproj | 6 + .../Metadata/ContentDefinitionManager.cs | 150 ++++++++++ .../Records/ContentFieldDefinitionRecord.cs | 6 + .../Records/ContentPartDefinitionRecord.cs | 19 ++ .../ContentPartFieldDefinitionRecord.cs | 8 + .../Records/ContentTypeDefinitionRecord.cs | 19 ++ .../ContentTypePartDefinitionRecord.cs | 7 + .../Modules/Orchard.MetaData/AdminMenu.cs | 2 +- .../Controllers/AdminController.cs | 82 ++++++ .../Controllers/MetaDataController.cs | 84 ------ .../Orchard.MetaData/Orchard.MetaData.csproj | 4 +- .../{MetaData => Admin}/ContentTypeList.ascx | 0 .../Orchard.Setup/Services/SetupService.cs | 25 +- src/Orchard/ContentManagement/ContentField.cs | 12 + src/Orchard/ContentManagement/ContentItem.cs | 2 + src/Orchard/ContentManagement/ContentPart.cs | 4 + .../Drivers/ContentItemDriverHandler.cs | 28 +- .../Handlers/ContentHandlerBase.cs | 65 ++++ .../Handlers/IContentHandler.cs | 3 +- .../Builders/ContentPartDefinitionBuilder.cs | 19 ++ .../Builders/ContentTypeDefinitionBuilder.cs | 103 +++++++ .../MetaData/ContentPartHandler.cs | 25 +- .../MetaData/IContentDefinitionManager.cs | 33 +++ .../MetaData/Models/ContentFieldDefinition.cs | 9 + .../MetaData/Models/ContentPartDefinition.cs | 36 +++ .../MetaData/Models/ContentTypeDefinition.cs | 32 ++ .../Records/ContentTypePartNameRecord.cs | 6 - .../MetaData/Records/ContentTypePartRecord.cs | 6 - .../MetaData/Services/ContentTypeService.cs | 81 ----- .../MetaData/Services/IContentTypeService.cs | 17 -- .../MetaData/Services/SettingsFormatter.cs | 24 ++ .../Records/ContentTypeRecord.cs | 14 +- src/Orchard/Data/SessionLocator.cs | 6 +- src/Orchard/Orchard.Framework.csproj | 278 +++++++++++++----- 47 files changed, 1222 insertions(+), 427 deletions(-) create mode 100644 src/Orchard.Core.Tests/Settings/Metadata/ContentDefinitionManagerTests.cs delete mode 100644 src/Orchard.Tests/ContentManagement/ContentTypeMetaDataTests.cs create mode 100644 src/Orchard.Tests/ContentManagement/MetaData/Builders/ContentTypeDefinitionBuilderTests.cs create mode 100644 src/Orchard.Web/Core/Settings/Metadata/ContentDefinitionManager.cs create mode 100644 src/Orchard.Web/Core/Settings/Metadata/Records/ContentFieldDefinitionRecord.cs create mode 100644 src/Orchard.Web/Core/Settings/Metadata/Records/ContentPartDefinitionRecord.cs create mode 100644 src/Orchard.Web/Core/Settings/Metadata/Records/ContentPartFieldDefinitionRecord.cs create mode 100644 src/Orchard.Web/Core/Settings/Metadata/Records/ContentTypeDefinitionRecord.cs create mode 100644 src/Orchard.Web/Core/Settings/Metadata/Records/ContentTypePartDefinitionRecord.cs create mode 100644 src/Orchard.Web/Modules/Orchard.MetaData/Controllers/AdminController.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.MetaData/Controllers/MetaDataController.cs rename src/Orchard.Web/Modules/Orchard.MetaData/Views/{MetaData => Admin}/ContentTypeList.ascx (100%) create mode 100644 src/Orchard/ContentManagement/ContentField.cs create mode 100644 src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs create mode 100644 src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs create mode 100644 src/Orchard/ContentManagement/MetaData/Builders/ContentTypeDefinitionBuilder.cs create mode 100644 src/Orchard/ContentManagement/MetaData/IContentDefinitionManager.cs create mode 100644 src/Orchard/ContentManagement/MetaData/Models/ContentFieldDefinition.cs create mode 100644 src/Orchard/ContentManagement/MetaData/Models/ContentPartDefinition.cs create mode 100644 src/Orchard/ContentManagement/MetaData/Models/ContentTypeDefinition.cs delete mode 100644 src/Orchard/ContentManagement/MetaData/Records/ContentTypePartNameRecord.cs delete mode 100644 src/Orchard/ContentManagement/MetaData/Records/ContentTypePartRecord.cs delete mode 100644 src/Orchard/ContentManagement/MetaData/Services/ContentTypeService.cs delete mode 100644 src/Orchard/ContentManagement/MetaData/Services/IContentTypeService.cs create mode 100644 src/Orchard/ContentManagement/MetaData/Services/SettingsFormatter.cs diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs index d62bae234..73cbde057 100644 --- a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs +++ b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs @@ -6,7 +6,6 @@ using JetBrains.Annotations; using Moq; using NUnit.Framework; using Orchard.ContentManagement.Aspects; -using Orchard.ContentManagement.MetaData.Records; using Orchard.Core.Common; using Orchard.Core.Common.Handlers; using Orchard.Core.Common.Models; @@ -47,8 +46,6 @@ namespace Orchard.Core.Tests.Common.Providers { get { return new[] { typeof(ContentTypeRecord), - typeof(ContentTypePartRecord), - typeof(ContentTypePartNameRecord), typeof(ContentItemRecord), typeof(ContentItemVersionRecord), typeof(CommonRecord), diff --git a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs index 69bb981db..695589dbb 100644 --- a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs +++ b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs @@ -6,7 +6,6 @@ using NUnit.Framework; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; using Orchard.ContentManagement.Handlers; -using Orchard.ContentManagement.MetaData.Records; using Orchard.ContentManagement.Records; using Orchard.Core.Common.Models; using Orchard.Core.Common.Services; @@ -182,8 +181,6 @@ namespace Orchard.Core.Tests.Common.Services { return new[] { typeof(RoutableRecord), typeof(ContentTypeRecord), - typeof(ContentTypePartRecord), - typeof(ContentTypePartNameRecord), typeof(ContentItemRecord), typeof(ContentItemVersionRecord), typeof(CommonRecord), diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index 307f9ed26..1d07df81b 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -109,6 +109,7 @@ <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Scheduling\ScheduledTaskManagerTests.cs" /> <Compile Include="Scheduling\ScheduledTaskExecutorTests.cs" /> + <Compile Include="Settings\Metadata\ContentDefinitionManagerTests.cs" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\Orchard.Tests.Modules\Orchard.Tests.Modules.csproj"> diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs index e7a7955dd..cf3d73786 100644 --- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs +++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs @@ -4,7 +4,6 @@ using Autofac; using Moq; using NUnit.Framework; using Orchard.ContentManagement; -using Orchard.ContentManagement.MetaData.Records; using Orchard.ContentManagement.Records; using Orchard.Core.Scheduling.Models; using Orchard.Core.Scheduling.Services; @@ -39,8 +38,6 @@ namespace Orchard.Core.Tests.Scheduling { get { return new[] { typeof(ContentTypeRecord), - typeof(ContentTypePartRecord), - typeof(ContentTypePartNameRecord), typeof(ContentItemRecord), typeof(ContentItemVersionRecord), typeof(ScheduledTaskRecord), diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs index baf3063c3..fe58b9a06 100644 --- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs +++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs @@ -5,7 +5,6 @@ using Autofac; using Moq; using NUnit.Framework; using Orchard.ContentManagement; -using Orchard.ContentManagement.MetaData.Records; using Orchard.ContentManagement.Records; using Orchard.Core.Scheduling.Models; using Orchard.Core.Scheduling.Services; @@ -42,8 +41,6 @@ namespace Orchard.Core.Tests.Scheduling { get { return new[] { typeof(ContentTypeRecord), - typeof(ContentTypePartRecord), - typeof(ContentTypePartNameRecord), typeof(ContentItemRecord), typeof(ContentItemVersionRecord), typeof(ScheduledTaskRecord), diff --git a/src/Orchard.Core.Tests/Settings/Metadata/ContentDefinitionManagerTests.cs b/src/Orchard.Core.Tests/Settings/Metadata/ContentDefinitionManagerTests.cs new file mode 100644 index 000000000..440c38864 --- /dev/null +++ b/src/Orchard.Core.Tests/Settings/Metadata/ContentDefinitionManagerTests.cs @@ -0,0 +1,211 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Autofac; +using Moq; +using NHibernate; +using NUnit.Framework; +using Orchard.ContentManagement.MetaData; +using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Models; +using Orchard.ContentManagement.MetaData.Services; +using Orchard.Core.Settings.Metadata; +using Orchard.Core.Settings.Metadata.Records; +using Orchard.Data; +using Orchard.Tests; +using Orchard.Tests.Utility; + +namespace Orchard.Core.Tests.Settings.Metadata { + [TestFixture] + public class ContentDefinitionManagerTests { + private string _databaseFileName; + private ISessionFactory _sessionFactory; + private ISession _session; + private IContainer _container; + + [TestFixtureSetUp] + public void InitFixture() { + _databaseFileName = Path.GetTempFileName(); + _sessionFactory = DataUtility.CreateSessionFactory( + _databaseFileName, + typeof(ContentTypeDefinitionRecord), + typeof(ContentTypePartDefinitionRecord), + typeof(ContentPartDefinitionRecord), + typeof(ContentPartFieldDefinitionRecord), + typeof(ContentFieldDefinitionRecord) + ); + } + + [SetUp] + public void Init() { + var builder = new ContainerBuilder(); + builder.RegisterAutoMocking(); + builder.RegisterType<ContentDefinitionManager>().As<IContentDefinitionManager>(); + builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)); + builder.RegisterType(typeof(SettingsFormatter)) + .As(typeof(IMapper<XElement, IDictionary<string, string>>)) + .As(typeof(IMapper<IDictionary<string, string>, XElement>)); + _container = builder.Build(); + + _container.Mock<ISessionLocator>() + .Setup(x => x.For(It.IsAny<Type>())) + .Returns(() => _session); + + _session = _sessionFactory.OpenSession(); + foreach (var killType in new[] { typeof(ContentTypeDefinitionRecord), typeof(ContentPartDefinitionRecord), typeof(ContentFieldDefinitionRecord) }) { + foreach (var killRecord in _session.CreateCriteria(killType).List()) { + _session.Delete(killRecord); + } + } + _session.Flush(); + } + + void ResetSession() { + _session.Flush(); + _session.Dispose(); + _session = _sessionFactory.OpenSession(); + } + + [TearDown] + public void Term() { + _session.Dispose(); + } + + [TestFixtureTearDown] + public void TermFixture() { + File.Delete(_databaseFileName); + } + + [Test] + public void NoTypesAreAvailableByDefault() { + var types = _container.Resolve<IContentDefinitionManager>().ListTypeDefinitions(); + Assert.That(types.Count(), Is.EqualTo(0)); + } + + [Test] + public void TypeRecordsAreReturned() { + var repository = _container.Resolve<IRepository<ContentTypeDefinitionRecord>>(); + repository.Create(new ContentTypeDefinitionRecord { Name = "alpha" }); + repository.Create(new ContentTypeDefinitionRecord { Name = "beta" }); + ResetSession(); + var types = _container.Resolve<IContentDefinitionManager>().ListTypeDefinitions(); + Assert.That(types.Count(), Is.EqualTo(2)); + } + + [Test] + public void TypeSettingsAreParsed() { + var repository = _container.Resolve<IRepository<ContentTypeDefinitionRecord>>(); + repository.Create(new ContentTypeDefinitionRecord { Name = "alpha", Settings = "<settings a='1' b='2'/>" }); + ResetSession(); + var alpha = _container.Resolve<IContentDefinitionManager>().ListTypeDefinitions().Single(); + Assert.That(alpha.Settings["a"], Is.EqualTo("1")); + Assert.That(alpha.Settings["b"], Is.EqualTo("2")); + } + + [Test] + public void ContentTypesWithSettingsCanBeCreatedAndModified() { + var manager = _container.Resolve<IContentDefinitionManager>(); + manager.StoreTypeDefinition(new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithSetting("a", "1") + .WithSetting("b", "2") + .Build()); + + manager.StoreTypeDefinition(new ContentTypeDefinitionBuilder() + .Named("beta") + .WithSetting("c", "3") + .WithSetting("d", "4") + .Build()); + + ResetSession(); + + var types1 = manager.ListTypeDefinitions(); + Assert.That(types1.Count(), Is.EqualTo(2)); + var alpha1 = types1.Single(t => t.Name == "alpha"); + Assert.That(alpha1.Settings["a"], Is.EqualTo("1")); + manager.StoreTypeDefinition(new ContentTypeDefinitionBuilder(alpha1).WithSetting("a", "5").Build()); + ResetSession(); + + var types2 = manager.ListTypeDefinitions(); + Assert.That(types2.Count(), Is.EqualTo(2)); + var alpha2 = types2.Single(t => t.Name == "alpha"); + Assert.That(alpha2.Settings["a"], Is.EqualTo("5")); + Assert.That(alpha2.Settings["a"], Is.EqualTo("5")); + } + + [Test] + public void StubPartDefinitionsAreCreatedWhenContentTypesAreStored() { + var manager = _container.Resolve<IContentDefinitionManager>(); + manager.StoreTypeDefinition(new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithPart("foo", pb => { }) + .Build()); + + ResetSession(); + + var fooRecord = _container.Resolve<IRepository<ContentPartDefinitionRecord>>().Fetch(r => r.Name == "foo").SingleOrDefault(); + Assert.That(fooRecord, Is.Not.Null); + Assert.That(fooRecord.Name, Is.EqualTo("foo")); + + var foo = manager.GetPartDefinition("foo"); + Assert.That(foo, Is.Not.Null); + Assert.That(foo.Name, Is.EqualTo("foo")); + + var alpha = manager.GetTypeDefinition("alpha"); + Assert.That(alpha, Is.Not.Null); + Assert.That(alpha.Parts.Count(), Is.EqualTo(1)); + Assert.That(alpha.Parts.Single().PartDefinition.Name, Is.EqualTo("foo")); + } + + [Test] + public void GettingDefinitionsByNameCanReturnNullAndWillAcceptNullEmptyOrInvalidNames() { + var manager = _container.Resolve<IContentDefinitionManager>(); + Assert.That(manager.GetTypeDefinition("no such name"), Is.Null); + Assert.That(manager.GetTypeDefinition(string.Empty), Is.Null); + Assert.That(manager.GetTypeDefinition(null), Is.Null); + Assert.That(manager.GetPartDefinition("no such name"), Is.Null); + Assert.That(manager.GetPartDefinition(string.Empty), Is.Null); + Assert.That(manager.GetPartDefinition(null), Is.Null); + } + + [Test] + public void PartsAreRemovedWhenNotReferencedButPartDefinitionRemains() { + var manager = _container.Resolve<IContentDefinitionManager>(); + manager.StoreTypeDefinition( + new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithPart("foo", pb => { }) + .WithPart("bar", pb => { }) + .Build()); + + AssertThatTypeHasParts("alpha","foo","bar"); + Assert.That(manager.ListPartDefinitions().Count(), Is.EqualTo(2)); + ResetSession(); + AssertThatTypeHasParts("alpha","foo","bar"); + Assert.That(manager.ListPartDefinitions().Count(), Is.EqualTo(2)); + + manager.StoreTypeDefinition( + new ContentTypeDefinitionBuilder(manager.GetTypeDefinition("alpha")) + .WithPart("frap", pb => { }) + .RemovePart("bar") + .Build()); + + AssertThatTypeHasParts("alpha","foo","frap"); + Assert.That(manager.ListPartDefinitions().Count(), Is.EqualTo(3)); + ResetSession(); + AssertThatTypeHasParts("alpha","foo","frap"); + Assert.That(manager.ListPartDefinitions().Count(), Is.EqualTo(3)); + } + + private void AssertThatTypeHasParts(string typeName, params string[] partNames) { + var type = _container.Resolve<IContentDefinitionManager>().GetTypeDefinition(typeName); + Assert.That(type, Is.Not.Null); + Assert.That(type.Parts.Count(), Is.EqualTo(partNames.Count())); + foreach(var partName in partNames) { + Assert.That(type.Parts.Select(p=>p.PartDefinition.Name), Has.Some.EqualTo(partName)); + } + } + } +} diff --git a/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs b/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs index 54dfd37f3..5b1f3a49f 100644 --- a/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs +++ b/src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs @@ -6,7 +6,6 @@ using System.Web.Routing; using Autofac; using Moq; using NUnit.Framework; -using Orchard.ContentManagement.MetaData.Records; using Orchard.Data; using Orchard.Environment; using Orchard.ContentManagement; @@ -47,8 +46,6 @@ namespace Orchard.Tests.Modules.Users.Controllers { get { return new[] { typeof(UserRecord), typeof(ContentTypeRecord), - typeof(ContentTypePartRecord), - typeof(ContentTypePartNameRecord), typeof(ContentItemRecord), typeof(ContentItemVersionRecord), }; diff --git a/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs b/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs index 81551167c..ea7ee2f3d 100644 --- a/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs +++ b/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs @@ -3,7 +3,6 @@ using System.Web.Security; using Autofac; using NHibernate; using NUnit.Framework; -using Orchard.ContentManagement.MetaData.Records; using Orchard.Data; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; @@ -42,9 +41,7 @@ namespace Orchard.Tests.Modules.Users.Services { typeof(UserRecord), typeof(ContentItemVersionRecord), typeof(ContentItemRecord), - typeof(ContentTypeRecord), - typeof(ContentTypePartRecord), - typeof(ContentTypePartNameRecord)); + typeof(ContentTypeRecord)); } [TestFixtureTearDown] diff --git a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs index 55d9960e5..8b37ebe65 100644 --- a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs +++ b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs @@ -2,7 +2,6 @@ using Autofac; using NHibernate; using NUnit.Framework; -using Orchard.ContentManagement.MetaData.Records; using Orchard.Data; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; @@ -28,9 +27,7 @@ namespace Orchard.Tests.ContentManagement { typeof(EpsilonRecord), typeof(ContentItemVersionRecord), typeof(ContentItemRecord), - typeof(ContentTypeRecord), - typeof(ContentTypePartRecord), - typeof(ContentTypePartNameRecord)); + typeof(ContentTypeRecord)); } [TestFixtureTearDown] diff --git a/src/Orchard.Tests/ContentManagement/ContentTypeMetaDataTests.cs b/src/Orchard.Tests/ContentManagement/ContentTypeMetaDataTests.cs deleted file mode 100644 index 94a31ebba..000000000 --- a/src/Orchard.Tests/ContentManagement/ContentTypeMetaDataTests.cs +++ /dev/null @@ -1,62 +0,0 @@ -using Autofac; -using NHibernate; -using NUnit.Framework; -using Orchard.ContentManagement; -using Orchard.ContentManagement.MetaData.Records; -using Orchard.ContentManagement.MetaData.Services; -using Orchard.ContentManagement.Records; -using Orchard.Data; - - -namespace Orchard.Tests.ContentManagement{ - [TestFixture] - public class ContentTypeMetaDataTests - { - private IContainer _container; - private ISessionFactory _sessionFactory; - private ISession _session; - - [TestFixtureSetUp] - public void InitFixture() - { - var databaseFileName = System.IO.Path.GetTempFileName(); - _sessionFactory = DataUtility.CreateSessionFactory( - databaseFileName, - typeof(ContentTypeRecord), - typeof(ContentItemRecord), - typeof(ContentTypePartRecord), - typeof(ContentTypePartNameRecord), - typeof(ContentItemVersionRecord)); - } - - [TestFixtureTearDown] - public void TermFixture() - { - - } - - [SetUp] - public void Init() - { - var builder = new ContainerBuilder(); - builder.RegisterType<DefaultContentManager>().As<IContentManager>(); - builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>(); - builder.RegisterType<ContentTypeService>().As<IContentTypeService>(); - builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)); - _session = _sessionFactory.OpenSession(); - builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>(); - - _container = builder.Build(); - } - - [Test] - public void MapandUnMapContentTypeToContentPart() - { - var contentTypeService = _container.Resolve<IContentTypeService>(); - contentTypeService.MapContentTypeToContentPart("foo", "bar"); - Assert.IsTrue(contentTypeService.ValidateContentTypeToContentPartMapping("foo","bar"),"Content Type not successfully mapped"); - contentTypeService.UnMapContentTypeToContentPart("foo", "bar"); - Assert.IsFalse(contentTypeService.ValidateContentTypeToContentPartMapping("foo", "bar"), "Content Type mapping not successfully deleted"); - } - } -} diff --git a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs index 6341d4f4c..36de12e5d 100644 --- a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs +++ b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs @@ -4,7 +4,6 @@ using System.Linq; using Autofac; using NHibernate; using NUnit.Framework; -using Orchard.ContentManagement.MetaData.Records; using Orchard.Data; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; @@ -26,8 +25,6 @@ namespace Orchard.Tests.ContentManagement { _sessionFactory = DataUtility.CreateSessionFactory( databaseFileName, typeof(ContentTypeRecord), - typeof(ContentTypePartRecord), - typeof(ContentTypePartNameRecord), typeof(ContentItemRecord), typeof(ContentItemVersionRecord), typeof(GammaRecord), diff --git a/src/Orchard.Tests/ContentManagement/MetaData/Builders/ContentTypeDefinitionBuilderTests.cs b/src/Orchard.Tests/ContentManagement/MetaData/Builders/ContentTypeDefinitionBuilderTests.cs new file mode 100644 index 000000000..be8549f18 --- /dev/null +++ b/src/Orchard.Tests/ContentManagement/MetaData/Builders/ContentTypeDefinitionBuilderTests.cs @@ -0,0 +1,130 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using NUnit.Framework; +using Orchard.ContentManagement.MetaData.Builders; + +namespace Orchard.Tests.ContentManagement.MetaData.Builders { + [TestFixture] + public class ContentTypeDefinitionBuilderTests { + [Test] + public void ContentTypeNameAndSettingsFromScratch() { + var contentTypeDefinition = new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithSetting("a", "1") + .WithSetting("b", "2") + .Build(); + Assert.That(contentTypeDefinition.Name, Is.EqualTo("alpha")); + Assert.That(contentTypeDefinition.Settings.Count(), Is.EqualTo(2)); + Assert.That(contentTypeDefinition.Settings["a"], Is.EqualTo("1")); + Assert.That(contentTypeDefinition.Settings["b"], Is.EqualTo("2")); + } + + [Test] + public void ContentRebuildWithoutModification() { + var contentTypeDefinition1 = new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithSetting("a", "1") + .WithSetting("b", "2") + .Build(); + var contentTypeDefinition2 = new ContentTypeDefinitionBuilder(contentTypeDefinition1) + .Build(); + Assert.That(contentTypeDefinition1, Is.Not.SameAs(contentTypeDefinition2)); + Assert.That(contentTypeDefinition2.Name, Is.EqualTo("alpha")); + Assert.That(contentTypeDefinition2.Settings.Count(), Is.EqualTo(2)); + Assert.That(contentTypeDefinition2.Settings["a"], Is.EqualTo("1")); + Assert.That(contentTypeDefinition2.Settings["b"], Is.EqualTo("2")); + } + + [Test] + public void ContentRebuildWithModification() { + var contentTypeDefinition1 = new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithSetting("a", "1") + .WithSetting("b", "2") + .Build(); + var contentTypeDefinition2 = new ContentTypeDefinitionBuilder(contentTypeDefinition1) + .Named("beta") + .WithSetting("b", "22") + .WithSetting("c", "3") + .Build(); + Assert.That(contentTypeDefinition1, Is.Not.SameAs(contentTypeDefinition2)); + Assert.That(contentTypeDefinition1.Name, Is.EqualTo("alpha")); + Assert.That(contentTypeDefinition1.Settings.Count(), Is.EqualTo(2)); + Assert.That(contentTypeDefinition1.Settings["a"], Is.EqualTo("1")); + Assert.That(contentTypeDefinition1.Settings["b"], Is.EqualTo("2")); + Assert.That(contentTypeDefinition2.Name, Is.EqualTo("beta")); + Assert.That(contentTypeDefinition2.Settings.Count(), Is.EqualTo(3)); + Assert.That(contentTypeDefinition2.Settings["a"], Is.EqualTo("1")); + Assert.That(contentTypeDefinition2.Settings["b"], Is.EqualTo("22")); + Assert.That(contentTypeDefinition2.Settings["c"], Is.EqualTo("3")); + } + + [Test] + public void AddingPartWithSettings() { + var contentTypeDefinition = new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithSetting("a", "1") + .WithSetting("b", "2") + .WithPart("foo", pb => pb.WithSetting("x", "10").WithSetting("y", "11")) + .Build(); + + Assert.That(contentTypeDefinition.Name, Is.EqualTo("alpha")); + Assert.That(contentTypeDefinition.Parts.Count(), Is.EqualTo(1)); + Assert.That(contentTypeDefinition.Parts.Single().PartDefinition.Name, Is.EqualTo("foo")); + Assert.That(contentTypeDefinition.Parts.Single().Settings.Count(), Is.EqualTo(2)); + Assert.That(contentTypeDefinition.Parts.Single().Settings["x"], Is.EqualTo("10")); + Assert.That(contentTypeDefinition.Parts.Single().Settings["y"], Is.EqualTo("11")); + } + + [Test] + public void CanAlterPartSettingsByNameDuringBuild() { + var contentTypeDefinition = new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithSetting("a", "1") + .WithSetting("b", "2") + .WithPart("foo", pb => pb.WithSetting("x", "10")) + .WithPart("foo", pb => pb.WithSetting("y", "11")) + .Build(); + + Assert.That(contentTypeDefinition.Name, Is.EqualTo("alpha")); + Assert.That(contentTypeDefinition.Parts.Count(), Is.EqualTo(1)); + Assert.That(contentTypeDefinition.Parts.Single().PartDefinition.Name, Is.EqualTo("foo")); + Assert.That(contentTypeDefinition.Parts.Single().Settings.Count(), Is.EqualTo(2)); + Assert.That(contentTypeDefinition.Parts.Single().Settings["x"], Is.EqualTo("10")); + Assert.That(contentTypeDefinition.Parts.Single().Settings["y"], Is.EqualTo("11")); + } + + [Test] + public void CanAlterPartSettingsByNameDuringRebuild() { + var contentTypeDefinition1 = new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithPart("foo", pb => pb.WithSetting("x", "10").WithSetting("y", "11")) + .Build(); + + var contentTypeDefinition2 = new ContentTypeDefinitionBuilder(contentTypeDefinition1) + .WithPart("foo", pb => pb.WithSetting("x", "12").WithSetting("z", "13")) + .Build(); + + Assert.That(contentTypeDefinition1.Name, Is.EqualTo("alpha")); + Assert.That(contentTypeDefinition1.Parts.Count(), Is.EqualTo(1)); + Assert.That(contentTypeDefinition1.Parts.Single().PartDefinition.Name, Is.EqualTo("foo")); + Assert.That(contentTypeDefinition1.Parts.Single().Settings.Count(), Is.EqualTo(2)); + Assert.That(contentTypeDefinition1.Parts.Single().Settings["x"], Is.EqualTo("10")); + Assert.That(contentTypeDefinition1.Parts.Single().Settings["y"], Is.EqualTo("11")); + Assert.That(contentTypeDefinition2.Name, Is.EqualTo("alpha")); + Assert.That(contentTypeDefinition2.Parts.Count(), Is.EqualTo(1)); + Assert.That(contentTypeDefinition2.Parts.Single().PartDefinition.Name, Is.EqualTo("foo")); + Assert.That(contentTypeDefinition2.Parts.Single().Settings.Count(), Is.EqualTo(3)); + Assert.That(contentTypeDefinition2.Parts.Single().Settings["x"], Is.EqualTo("12")); + Assert.That(contentTypeDefinition2.Parts.Single().Settings["y"], Is.EqualTo("11")); + Assert.That(contentTypeDefinition2.Parts.Single().Settings["z"], Is.EqualTo("13")); + } + + [Test, IgnoreAttribute("Merging not yet implemented")] + public void ContentMergeOverlaysSettings() { + Assert.Fail(); + } + } +} diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 258137642..5d469d06c 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -148,12 +148,12 @@ <Compile Include="ContentManagement\ContentQueryTests.cs"> <SubType>Code</SubType> </Compile> - <Compile Include="ContentManagement\ContentTypeMetaDataTests.cs" /> <Compile Include="ContentManagement\DefaultContentManagerTests.cs"> <SubType>Code</SubType> </Compile> <Compile Include="ContentManagement\Handlers\ContentHandlerTests.cs" /> <Compile Include="ContentManagement\Handlers\ModelBuilderTests.cs" /> + <Compile Include="ContentManagement\MetaData\Builders\ContentTypeDefinitionBuilderTests.cs" /> <Compile Include="ContentManagement\Models\Alpha.cs" /> <Compile Include="ContentManagement\Models\AlphaHandler.cs" /> <Compile Include="ContentManagement\Models\Beta.cs" /> diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index b7d14d395..b29aa2515 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -143,6 +143,12 @@ <Compile Include="Scheduling\Services\ScheduledTaskExecutor.cs" /> <Compile Include="Scheduling\Models\Task.cs" /> <Compile Include="Settings\Drivers\SiteSettingsDriver.cs" /> + <Compile Include="Settings\Metadata\ContentDefinitionManager.cs" /> + <Compile Include="Settings\Metadata\Records\ContentFieldDefinitionRecord.cs" /> + <Compile Include="Settings\Metadata\Records\ContentPartDefinitionRecord.cs" /> + <Compile Include="Settings\Metadata\Records\ContentPartFieldDefinitionRecord.cs" /> + <Compile Include="Settings\Metadata\Records\ContentTypeDefinitionRecord.cs" /> + <Compile Include="Settings\Metadata\Records\ContentTypePartDefinitionRecord.cs" /> <Compile Include="Settings\Models\SiteSettingsRecord.cs" /> <Compile Include="Settings\Permissions.cs" /> <Compile Include="Settings\State\Records\ShellFeatureStateRecord.cs" /> diff --git a/src/Orchard.Web/Core/Settings/Metadata/ContentDefinitionManager.cs b/src/Orchard.Web/Core/Settings/Metadata/ContentDefinitionManager.cs new file mode 100644 index 000000000..c3be204ac --- /dev/null +++ b/src/Orchard.Web/Core/Settings/Metadata/ContentDefinitionManager.cs @@ -0,0 +1,150 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Xml.Linq; +using Orchard.ContentManagement.MetaData; +using Orchard.ContentManagement.MetaData.Models; +using Orchard.Core.Settings.Metadata.Records; +using Orchard.Data; +using Orchard.Logging; +using Orchard.Utility.Extensions; + +namespace Orchard.Core.Settings.Metadata { + public class ContentDefinitionManager : Component, IContentDefinitionManager { + private readonly IRepository<ContentTypeDefinitionRecord> _typeDefinitionRepository; + private readonly IRepository<ContentPartDefinitionRecord> _partDefinitionRepository; + private readonly IMapper<XElement, IDictionary<string, string>> _settingsReader; + private readonly IMapper<IDictionary<string, string>, XElement> _settingsWriter; + + public ContentDefinitionManager( + IRepository<ContentTypeDefinitionRecord> typeDefinitionRepository, + IRepository<ContentPartDefinitionRecord> partDefinitionRepository, + IMapper<XElement, IDictionary<string, string>> settingsReader, + IMapper<IDictionary<string, string>, XElement> settingsWriter) { + _typeDefinitionRepository = typeDefinitionRepository; + _partDefinitionRepository = partDefinitionRepository; + _settingsReader = settingsReader; + _settingsWriter = settingsWriter; + } + + public ContentTypeDefinition GetTypeDefinition(string name) { + return _typeDefinitionRepository.Fetch(x => x.Name == name).Select(Build).SingleOrDefault(); + } + + public ContentPartDefinition GetPartDefinition(string name) { + return _partDefinitionRepository.Fetch(x => x.Name == name).Select(Build).SingleOrDefault(); + } + + public IEnumerable<ContentTypeDefinition> ListTypeDefinitions() { + return _typeDefinitionRepository.Fetch(x => !x.Hidden).Select(Build).ToReadOnlyCollection(); + } + + public IEnumerable<ContentPartDefinition> ListPartDefinitions() { + return _partDefinitionRepository.Fetch(x => !x.Hidden).Select(Build).ToReadOnlyCollection(); + } + + public void StoreTypeDefinition(ContentTypeDefinition contentTypeDefinition) { + Apply(contentTypeDefinition, Acquire(contentTypeDefinition)); + } + + public void StorePartDefinition(ContentPartDefinition contentPartDefinition) { + throw new NotImplementedException(); + } + + private ContentTypeDefinitionRecord Acquire(ContentTypeDefinition contentTypeDefinition) { + var result = _typeDefinitionRepository.Fetch(x => x.Name == contentTypeDefinition.Name).SingleOrDefault(); + if (result == null) { + result = new ContentTypeDefinitionRecord { Name = contentTypeDefinition.Name }; + _typeDefinitionRepository.Create(result); + } + return result; + } + + private ContentPartDefinitionRecord Acquire(ContentPartDefinition contentPartDefinition) { + var result = _partDefinitionRepository.Fetch(x => x.Name == contentPartDefinition.Name).SingleOrDefault(); + if (result == null) { + result = new ContentPartDefinitionRecord { Name = contentPartDefinition.Name }; + _partDefinitionRepository.Create(result); + } + return result; + } + + private void Apply(ContentTypeDefinition model, ContentTypeDefinitionRecord record) { + record.Settings = _settingsWriter.Map(model.Settings).ToString(); + + var toRemove = record.ContentTypePartDefinitionRecords + .Where(partDefinitionRecord => !model.Parts.Any(part => partDefinitionRecord.ContentPartDefinitionRecord.Name == part.PartDefinition.Name)) + .ToList(); + + foreach (var remove in toRemove) { + record.ContentTypePartDefinitionRecords.Remove(remove); + } + + foreach (var part in model.Parts) { + var partName = part.PartDefinition.Name; + var typePartRecord = record.ContentTypePartDefinitionRecords.SingleOrDefault(r => r.ContentPartDefinitionRecord.Name == partName); + if (typePartRecord == null) { + typePartRecord = new ContentTypePartDefinitionRecord { ContentPartDefinitionRecord = Acquire(part.PartDefinition) }; + record.ContentTypePartDefinitionRecords.Add(typePartRecord); + } + Apply(part, typePartRecord); + } + } + + private void Apply(ContentTypeDefinition.Part model, ContentTypePartDefinitionRecord record) { + record.Settings = Compose(_settingsWriter.Map(model.Settings)); + } + + + + ContentTypeDefinition Build(ContentTypeDefinitionRecord source) { + return new ContentTypeDefinition( + source.Name, + source.ContentTypePartDefinitionRecords.Select(Build), + _settingsReader.Map(Parse(source.Settings))); + } + + ContentTypeDefinition.Part Build(ContentTypePartDefinitionRecord source) { + return new ContentTypeDefinition.Part( + Build(source.ContentPartDefinitionRecord), + _settingsReader.Map(Parse(source.Settings))); + } + + ContentPartDefinition Build(ContentPartDefinitionRecord source) { + return new ContentPartDefinition( + source.Name, + source.ContentPartFieldDefinitionRecords.Select(Build), + _settingsReader.Map(Parse(source.Settings))); + } + + ContentPartDefinition.Field Build(ContentPartFieldDefinitionRecord source) { + return new ContentPartDefinition.Field( + Build(source.ContentFieldDefinitionRecord), + source.Name, + _settingsReader.Map(Parse(source.Settings))); + } + + ContentFieldDefinition Build(ContentFieldDefinitionRecord source) { + return new ContentFieldDefinition(source.Name); + } + + XElement Parse(string settings) { + if (string.IsNullOrEmpty(settings)) + return null; + + try { + return XElement.Parse(settings); + } + catch (Exception ex) { + Logger.Error(ex, "Unable to parse settings xml"); + return null; + } + } + string Compose(XElement map) { + if (map == null) + return null; + + return map.ToString(); + } + } +} diff --git a/src/Orchard.Web/Core/Settings/Metadata/Records/ContentFieldDefinitionRecord.cs b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentFieldDefinitionRecord.cs new file mode 100644 index 000000000..a8cf97aff --- /dev/null +++ b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentFieldDefinitionRecord.cs @@ -0,0 +1,6 @@ +namespace Orchard.Core.Settings.Metadata.Records { + public class ContentFieldDefinitionRecord { + public virtual int Id { get; set; } + public virtual string Name { get; set; } + } +} diff --git a/src/Orchard.Web/Core/Settings/Metadata/Records/ContentPartDefinitionRecord.cs b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentPartDefinitionRecord.cs new file mode 100644 index 000000000..76045f25b --- /dev/null +++ b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentPartDefinitionRecord.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using Orchard.Data.Conventions; + +namespace Orchard.Core.Settings.Metadata.Records { + public class ContentPartDefinitionRecord { + public ContentPartDefinitionRecord() { + ContentPartFieldDefinitionRecords = new List<ContentPartFieldDefinitionRecord>(); + } + + public virtual int Id { get; set; } + public virtual string Name { get; set; } + public virtual bool Hidden { get; set; } + public virtual string Settings { get; set; } + + [CascadeAllDeleteOrphan] + public virtual IList<ContentPartFieldDefinitionRecord> ContentPartFieldDefinitionRecords { get; set; } + + } +} diff --git a/src/Orchard.Web/Core/Settings/Metadata/Records/ContentPartFieldDefinitionRecord.cs b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentPartFieldDefinitionRecord.cs new file mode 100644 index 000000000..f85da77d0 --- /dev/null +++ b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentPartFieldDefinitionRecord.cs @@ -0,0 +1,8 @@ +namespace Orchard.Core.Settings.Metadata.Records { + public class ContentPartFieldDefinitionRecord { + public virtual int Id { get; set; } + public virtual ContentFieldDefinitionRecord ContentFieldDefinitionRecord { get; set; } + public virtual string Name { get; set; } + public virtual string Settings { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Settings/Metadata/Records/ContentTypeDefinitionRecord.cs b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentTypeDefinitionRecord.cs new file mode 100644 index 000000000..0f6806c19 --- /dev/null +++ b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentTypeDefinitionRecord.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using Orchard.Data.Conventions; + +namespace Orchard.Core.Settings.Metadata.Records { + public class ContentTypeDefinitionRecord { + public ContentTypeDefinitionRecord() { + ContentTypePartDefinitionRecords = new List<ContentTypePartDefinitionRecord>(); + } + + public virtual int Id { get; set; } + public virtual string Name { get; set; } + public virtual bool Hidden { get; set; } + public virtual string Settings { get; set; } + + [CascadeAllDeleteOrphan] + public virtual IList<ContentTypePartDefinitionRecord> ContentTypePartDefinitionRecords { get; set; } + } + +} diff --git a/src/Orchard.Web/Core/Settings/Metadata/Records/ContentTypePartDefinitionRecord.cs b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentTypePartDefinitionRecord.cs new file mode 100644 index 000000000..72a6fe137 --- /dev/null +++ b/src/Orchard.Web/Core/Settings/Metadata/Records/ContentTypePartDefinitionRecord.cs @@ -0,0 +1,7 @@ +namespace Orchard.Core.Settings.Metadata.Records { + public class ContentTypePartDefinitionRecord { + public virtual int Id { get; set; } + public virtual ContentPartDefinitionRecord ContentPartDefinitionRecord { get; set; } + public virtual string Settings { get; set; } + } +} diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs index 24956fde2..dbba1d1be 100644 --- a/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs @@ -12,7 +12,7 @@ namespace Orchard.MetaData { { builder.Add(T("Content Types"), "5", menu => menu - .Add(T("Content Types"), "1.0", item => item.Action("ContentTypeList", "MetaData", new { area = "Orchard.MetaData" }).Permission(Permissions.ManageMetaData)) + .Add(T("Content Types"), "1.0", item => item.Action("ContentTypeList", "Admin", new { area = "Orchard.MetaData" }).Permission(Permissions.ManageMetaData)) ); } diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MetaData/Controllers/AdminController.cs new file mode 100644 index 000000000..baae2d64c --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.MetaData/Controllers/AdminController.cs @@ -0,0 +1,82 @@ +using System.Web.Mvc; +using Orchard.ContentManagement.MetaData; +using Orchard.Localization; +using Orchard.MetaData.ViewModels; + +namespace Orchard.MetaData.Controllers { + + public class AdminController : Controller { + private readonly IContentDefinitionManager _contentDefinitionManager; + public IOrchardServices Services { get; set; } + + public AdminController(IOrchardServices services, IContentDefinitionManager contentDefinitionManager) { + _contentDefinitionManager = contentDefinitionManager; + Services = services; + T = NullLocalizer.Instance; + } + + public Localizer T { get; set; } + // + // GET: /ContentTypeList/ + + public ActionResult ContentTypeList(string id) { + + if (!Services.Authorizer.Authorize(Permissions.ManageMetaData, T("Not allowed to manage MetaData"))) + return new HttpUnauthorizedResult(); + + var contentTypes = _contentDefinitionManager.ListTypeDefinitions(); + var contentParts = _contentDefinitionManager.ListPartDefinitions(); + + var model = new ContentTypesIndexViewModel(); + + foreach (var contentType in contentTypes) { + var contentTypeEntry = new ContentTypeEntry { Name = contentType.Name, DisplayName = contentType.Name }; + + if (contentType.Name == id) { + foreach (var contentTypePartNameRecord in contentParts) { + var contentTypePartEntry = new ContentTypePartEntry { Name = contentTypePartNameRecord.Name }; + foreach (var contentTypePartEntryTest in contentType.Parts) { + if (contentTypePartEntryTest.PartDefinition.Name == contentTypePartEntry.Name) { + contentTypePartEntry.Selected = true; + } + } + model.ContentTypeParts.Add(contentTypePartEntry); + } + model.SelectedContentType = contentTypeEntry; + } + model.ContentTypes.Add(contentTypeEntry); + } + return View(model); + } + + + // + // POST: /ContentTypeList/Save + [HttpPost] + public ActionResult Save(string id, FormCollection collection) { + if (!Services.Authorizer.Authorize(Permissions.ManageMetaData, T("Not allowed to manage MetaData"))) + return new HttpUnauthorizedResult(); + + var existingDefinition = _contentDefinitionManager.GetTypeDefinition(id); + + _contentDefinitionManager.AlterTypeDefinition(id, alter => { + foreach(var part in existingDefinition.Parts) { + alter.RemovePart(part.PartDefinition.Name); + } + foreach (var formKey in collection.AllKeys) { + if (formKey.Contains("part_")) { + var partName = formKey.Replace("part_", ""); + alter.WithPart(partName); + } + } + + }); + + return RedirectToAction("ContentTypeList", new { id }); + + + } + + + } +} diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Controllers/MetaDataController.cs b/src/Orchard.Web/Modules/Orchard.MetaData/Controllers/MetaDataController.cs deleted file mode 100644 index 2e6f991c5..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Controllers/MetaDataController.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System.Web.Mvc; -using Orchard.ContentManagement.MetaData.Services; -using Orchard.Localization; -using Orchard.MetaData.ViewModels; -using Orchard.UI.Admin; - -namespace Orchard.MetaData.Controllers -{ - [Admin] - public class MetaDataController : Controller - { - private readonly IContentTypeService _contentTypeService; - public IOrchardServices Services { get; set; } - - public MetaDataController(IOrchardServices services, IContentTypeService contentTypeService) - { - _contentTypeService = contentTypeService; - Services = services; - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - // - // GET: /ContentTypeList/ - - public ActionResult ContentTypeList(string id) { - - if (!Services.Authorizer.Authorize(Permissions.ManageMetaData, T("Not allowed to manage MetaData"))) - return new HttpUnauthorizedResult(); - - var contentTypes = _contentTypeService.GetContentTypes(); - var contentTypePartNames = _contentTypeService.GetContentTypePartNames(); - - var model = new ContentTypesIndexViewModel(); - - foreach(var contentType in contentTypes) { - var contentTypeEntry = new ContentTypeEntry {Name = contentType.Name,DisplayName = contentType.Name}; - - if (contentType.Name==id) { - foreach(var contentTypePartNameRecord in contentTypePartNames) { - var contentTypePartEntry = new ContentTypePartEntry { Name = contentTypePartNameRecord.PartName }; - foreach(var contentTypePartEntryTest in contentType.ContentParts) { - if (contentTypePartEntryTest.PartName.PartName==contentTypePartEntry.Name) { - contentTypePartEntry.Selected = true; - } - } - model.ContentTypeParts.Add(contentTypePartEntry); - } - model.SelectedContentType = contentTypeEntry; - } - model.ContentTypes.Add(contentTypeEntry); - } - return View(model); - } - - - // - // POST: /ContentTypeList/Save - [HttpPost] - public ActionResult Save(string id, FormCollection collection) - { - if (!Services.Authorizer.Authorize(Permissions.ManageMetaData, T("Not allowed to manage MetaData"))) - return new HttpUnauthorizedResult(); - - var contentTypeRecord = _contentTypeService.GetContentTypeRecord(id); - //using a while loop because we are removing items from the collection - while (contentTypeRecord.ContentParts.Count>0) { - _contentTypeService.UnMapContentTypeToContentPart(contentTypeRecord.Name, contentTypeRecord.ContentParts[0].PartName.PartName); - } - foreach(var formKey in collection.AllKeys) { - if (formKey.Contains("part_")) { - var partName = formKey.Replace("part_", ""); - _contentTypeService.MapContentTypeToContentPart(contentTypeRecord.Name,partName); - } - } - - return RedirectToAction("ContentTypeList", new { id }); - - - } - - - } -} diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj b/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj index 5f6504dcd..5f110a3d1 100644 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj +++ b/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj @@ -66,7 +66,7 @@ </ItemGroup> <ItemGroup> <Compile Include="AdminMenu.cs" /> - <Compile Include="Controllers\MetaDataController.cs" /> + <Compile Include="Controllers\AdminController.cs" /> <Compile Include="Permissions.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="ViewModels\ContentTypesViewModel.cs" /> @@ -74,7 +74,7 @@ <ItemGroup> <Content Include="Module.txt" /> <Content Include="Web.config" /> - <Content Include="Views\MetaData\ContentTypeList.ascx" /> + <Content Include="Views\Admin\ContentTypeList.ascx" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj"> diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx b/src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx similarity index 100% rename from src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx rename to src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index 26e50d90a..49cbb27d4 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -3,6 +3,8 @@ using System.Linq; using System.Web; using Orchard.Comments.Models; using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; +using Orchard.ContentManagement.MetaData.Builders; using Orchard.Core.Common.Models; using Orchard.Core.Navigation.Models; using Orchard.Core.Settings.Models; @@ -79,7 +81,7 @@ namespace Orchard.Setup.Services { } var shellSettings = new ShellSettings(_shellSettings); - + if (string.IsNullOrEmpty(shellSettings.DataProvider)) { shellSettings.DataProvider = context.DatabaseProvider; shellSettings.DataConnectionString = context.DatabaseConnectionString; @@ -169,23 +171,10 @@ namespace Orchard.Setup.Services { authenticationService.SignIn(user, true); } - //Add ContentType mappings - var contentTypeService = environment.Resolve<IContentTypeService>(); - - //Add ContentTypePartNames to MetaData - contentTypeService.AddContentTypePartNameToMetaData("HasComments"); - contentTypeService.AddContentTypePartNameToMetaData("HasTags"); - - //Add mappings from ContentTypes to ContentParts to MetaData - contentTypeService.MapContentTypeToContentPart("blogpost","HasComments"); - contentTypeService.MapContentTypeToContentPart("page", "HasComments"); - contentTypeService.MapContentTypeToContentPart("sandboxpage", "HasComments"); - contentTypeService.MapContentTypeToContentPart("blogpost", "HasTags"); - contentTypeService.MapContentTypeToContentPart("page", "HasTags"); - contentTypeService.MapContentTypeToContentPart("sandboxpage", "HasTags"); - - - + var contentDefinitionManager = environment.Resolve<IContentDefinitionManager>(); + contentDefinitionManager.AlterTypeDefinition("blogpost", cfg => cfg.WithPart("HasComments").WithPart("HasTags")); + contentDefinitionManager.AlterTypeDefinition("page", cfg => cfg.WithPart("HasComments").WithPart("HasTags")); + contentDefinitionManager.AlterTypeDefinition("sandboxpage", cfg => cfg.WithPart("HasComments").WithPart("HasTags")); } catch { environment.Resolve<ITransactionManager>().Cancel(); diff --git a/src/Orchard/ContentManagement/ContentField.cs b/src/Orchard/ContentManagement/ContentField.cs new file mode 100644 index 000000000..953c94953 --- /dev/null +++ b/src/Orchard/ContentManagement/ContentField.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Orchard.ContentManagement.MetaData.Models; + +namespace Orchard.ContentManagement { + public class ContentField { + public string Name { get; set; } + public ContentFieldDefinition Definition { get; set; } + } +} diff --git a/src/Orchard/ContentManagement/ContentItem.cs b/src/Orchard/ContentManagement/ContentItem.cs index 42956b558..a6f751230 100644 --- a/src/Orchard/ContentManagement/ContentItem.cs +++ b/src/Orchard/ContentManagement/ContentItem.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Orchard.ContentManagement.MetaData.Models; using Orchard.ContentManagement.Records; namespace Orchard.ContentManagement { @@ -17,6 +18,7 @@ namespace Orchard.ContentManagement { public int Version { get { return VersionRecord == null ? 0 : VersionRecord.Number; } } public string ContentType { get; set; } + public ContentTypeDefinition TypeDefinition { get; set; } public ContentItemRecord Record { get { return VersionRecord == null ? null : VersionRecord.ContentItemRecord; } } public ContentItemVersionRecord VersionRecord { get; set; } diff --git a/src/Orchard/ContentManagement/ContentPart.cs b/src/Orchard/ContentManagement/ContentPart.cs index 180ea362f..f360ef5bc 100644 --- a/src/Orchard/ContentManagement/ContentPart.cs +++ b/src/Orchard/ContentManagement/ContentPart.cs @@ -1,8 +1,12 @@ +using Orchard.ContentManagement.MetaData.Models; using Orchard.ContentManagement.Utilities; namespace Orchard.ContentManagement { public abstract class ContentPart : IContent { public virtual ContentItem ContentItem { get; set; } + public ContentTypeDefinition TypeDefinition { get; set; } + public ContentTypeDefinition.Part TypePartDefinition { get; set; } + public ContentPartDefinition PartDefinition { get; set; } } public class ContentPart<TRecord> : ContentPart { diff --git a/src/Orchard/ContentManagement/Drivers/ContentItemDriverHandler.cs b/src/Orchard/ContentManagement/Drivers/ContentItemDriverHandler.cs index ca2cbd200..f6d456c32 100644 --- a/src/Orchard/ContentManagement/Drivers/ContentItemDriverHandler.cs +++ b/src/Orchard/ContentManagement/Drivers/ContentItemDriverHandler.cs @@ -5,7 +5,7 @@ using Orchard.Logging; namespace Orchard.ContentManagement.Drivers { [UsedImplicitly] - public class ContentItemDriverHandler : IContentHandler { + public class ContentItemDriverHandler : ContentHandlerBase { private readonly IEnumerable<IContentItemDriver> _drivers; public ContentItemDriverHandler(IEnumerable<IContentItemDriver> drivers) { @@ -15,33 +15,17 @@ namespace Orchard.ContentManagement.Drivers { public ILogger Logger { get; set; } - IEnumerable<ContentType> IContentHandler.GetContentTypes() { + public override IEnumerable<ContentType> GetContentTypes() { var contentTypes = new List<ContentType>(); _drivers.Invoke(driver=>contentTypes.AddRange(driver.GetContentTypes()), Logger); return contentTypes; } - void IContentHandler.Activating(ActivatingContentContext context) { } - void IContentHandler.Activated(ActivatedContentContext context) { } - void IContentHandler.Creating(CreateContentContext context) { } - void IContentHandler.Created(CreateContentContext context) { } - void IContentHandler.Loading(LoadContentContext context) { } - void IContentHandler.Loaded(LoadContentContext context) { } - void IContentHandler.Versioning(VersionContentContext context) { } - void IContentHandler.Versioned(VersionContentContext context) { } - void IContentHandler.Publishing(PublishContentContext context) { } - void IContentHandler.Published(PublishContentContext context) { } - void IContentHandler.Removing(RemoveContentContext context) { } - void IContentHandler.Removed(RemoveContentContext context) { } - void IContentHandler.Indexing(IndexContentContext context) { } - void IContentHandler.Indexed(IndexContentContext context) { } - - - void IContentHandler.GetContentItemMetadata(GetContentItemMetadataContext context) { + public override void GetContentItemMetadata(GetContentItemMetadataContext context) { _drivers.Invoke(driver => driver.GetContentItemMetadata(context), Logger); } - void IContentHandler.BuildDisplayModel(BuildDisplayModelContext context) { + public override void BuildDisplayModel(BuildDisplayModelContext context) { _drivers.Invoke(driver => { var result = driver.BuildDisplayModel(context); if (result != null) @@ -49,7 +33,7 @@ namespace Orchard.ContentManagement.Drivers { }, Logger); } - void IContentHandler.BuildEditorModel(BuildEditorModelContext context) { + public override void BuildEditorModel(BuildEditorModelContext context) { _drivers.Invoke(driver => { var result = driver.BuildEditorModel(context); if (result != null) @@ -57,7 +41,7 @@ namespace Orchard.ContentManagement.Drivers { }, Logger); } - void IContentHandler.UpdateEditorModel(UpdateEditorModelContext context) { + public override void UpdateEditorModel(UpdateEditorModelContext context) { _drivers.Invoke(driver => { var result = driver.UpdateEditorModel(context); if (result != null) diff --git a/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs b/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs new file mode 100644 index 000000000..f8026393a --- /dev/null +++ b/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Orchard.ContentManagement.Handlers { + public class ContentHandlerBase : IContentHandler { + public virtual IEnumerable<ContentType> GetContentTypes() { + return Enumerable.Empty<ContentType>(); + } + + public virtual void Activating(ActivatingContentContext context) { + } + + public virtual void Activated(ActivatedContentContext context) { + } + + public virtual void Creating(CreateContentContext context) { + } + + public virtual void Created(CreateContentContext context) { + } + + public virtual void Loading(LoadContentContext context) { + } + + public virtual void Loaded(LoadContentContext context) { + } + + public virtual void Versioning(VersionContentContext context) { + } + + public virtual void Versioned(VersionContentContext context) { + } + + public virtual void Publishing(PublishContentContext context) { + } + + public virtual void Published(PublishContentContext context) { + } + + public virtual void Removing(RemoveContentContext context) { + } + + public virtual void Removed(RemoveContentContext context) { + } + + public virtual void Indexing(IndexContentContext context) { + } + + public virtual void Indexed(IndexContentContext context) { + } + + public virtual void GetContentItemMetadata(GetContentItemMetadataContext context) { + } + + public virtual void BuildDisplayModel(BuildDisplayModelContext context) { + } + + public virtual void BuildEditorModel(BuildEditorModelContext context) { + } + + public virtual void UpdateEditorModel(UpdateEditorModelContext context) { + } + } +} \ No newline at end of file diff --git a/src/Orchard/ContentManagement/Handlers/IContentHandler.cs b/src/Orchard/ContentManagement/Handlers/IContentHandler.cs index 846e6a1fd..7dc37cfa7 100644 --- a/src/Orchard/ContentManagement/Handlers/IContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/IContentHandler.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using Orchard.Events; namespace Orchard.ContentManagement.Handlers { diff --git a/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs b/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs new file mode 100644 index 000000000..4e9fc0de6 --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs @@ -0,0 +1,19 @@ +using System; +using Orchard.ContentManagement.MetaData.Models; + +namespace Orchard.ContentManagement.MetaData.Builders { + public class ContentPartDefinitionBuilder { + public ContentPartDefinitionBuilder(ContentPartDefinition partDefinition) { + throw new NotImplementedException(); + } + + public ContentPartDefinition Build() { + throw new NotImplementedException(); + } + + public ContentPartDefinitionBuilder WithSetting(string name, string value) { + throw new NotImplementedException(); + } + + } +} \ No newline at end of file diff --git a/src/Orchard/ContentManagement/MetaData/Builders/ContentTypeDefinitionBuilder.cs b/src/Orchard/ContentManagement/MetaData/Builders/ContentTypeDefinitionBuilder.cs new file mode 100644 index 000000000..b2d997079 --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/Builders/ContentTypeDefinitionBuilder.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Orchard.ContentManagement.MetaData.Models; + +namespace Orchard.ContentManagement.MetaData.Builders { + public class ContentTypeDefinitionBuilder { + private string _name; + private readonly IList<ContentTypeDefinition.Part> _parts; + private readonly IDictionary<string, string> _settings; + + public ContentTypeDefinitionBuilder() + : this(new ContentTypeDefinition(null)) { + } + + public ContentTypeDefinitionBuilder(ContentTypeDefinition existing) { + if (existing == null) { + _parts = new List<ContentTypeDefinition.Part>(); + _settings = new Dictionary<string, string>(); + } + else { + _name = existing.Name; + _parts = existing.Parts.ToList(); + _settings = existing.Settings.ToDictionary(kv => kv.Key, kv => kv.Value); + } + } + + private void Init(ContentTypeDefinition existing) { + + } + + public ContentTypeDefinition Build() { + return new ContentTypeDefinition(_name, _parts, _settings); + } + + public ContentTypeDefinitionBuilder Named(string name) { + _name = name; + return this; + } + + public ContentTypeDefinitionBuilder WithSetting(string name, string value) { + _settings[name] = value; + return this; + } + + public ContentTypeDefinitionBuilder RemovePart(string partName) { + var existingPart = _parts.SingleOrDefault(x => x.PartDefinition.Name == partName); + if (existingPart != null) { + _parts.Remove(existingPart); + } + return this; + } + + public ContentTypeDefinitionBuilder WithPart(string partName) { + return WithPart(partName, configuration => { }); + } + + public ContentTypeDefinitionBuilder WithPart(string partName, Action<PartConfigurer> configuration) { + return WithPart(new ContentPartDefinition(partName), configuration); + } + + public ContentTypeDefinitionBuilder WithPart(ContentPartDefinition partDefinition, Action<PartConfigurer> configuration) { + var existingPart = _parts.SingleOrDefault(x => x.PartDefinition.Name == partDefinition.Name); + if (existingPart != null) { + _parts.Remove(existingPart); + } + else { + existingPart = new ContentTypeDefinition.Part(partDefinition, new Dictionary<string, string>()); + } + var configurer = new PartConfigurerImpl(existingPart); + configuration(configurer); + _parts.Add(configurer.Build()); + return this; + } + + public abstract class PartConfigurer { + protected readonly IDictionary<string, string> _settings; + + protected PartConfigurer(ContentTypeDefinition.Part part) { + _settings = part.Settings.ToDictionary(kv => kv.Key, kv => kv.Value); + } + + public PartConfigurer WithSetting(string name, string value) { + _settings[name] = value; + return this; + } + } + + class PartConfigurerImpl : PartConfigurer { + private readonly ContentPartDefinition _partDefinition; + + public PartConfigurerImpl(ContentTypeDefinition.Part part) + : base(part) { + _partDefinition = part.PartDefinition; + } + + public ContentTypeDefinition.Part Build() { + return new ContentTypeDefinition.Part(_partDefinition, _settings); + } + } + + } +} diff --git a/src/Orchard/ContentManagement/MetaData/ContentPartHandler.cs b/src/Orchard/ContentManagement/MetaData/ContentPartHandler.cs index 350e27371..4a4403115 100644 --- a/src/Orchard/ContentManagement/MetaData/ContentPartHandler.cs +++ b/src/Orchard/ContentManagement/MetaData/ContentPartHandler.cs @@ -1,32 +1,27 @@ using System.Collections.Generic; using System.Linq; using Orchard.ContentManagement.Handlers; -using Orchard.ContentManagement.MetaData.Services; using Orchard.ContentManagement.Drivers; namespace Orchard.ContentManagement.MetaData { - public class ContentPartHandler : ContentHandler { + public class ContentPartHandler : ContentHandlerBase { private readonly IEnumerable<IContentPartDriver> _contentPartDrivers; - private readonly IContentTypeService _contentTypeService; + private readonly IContentDefinitionManager _contentDefinitionManager; - public ContentPartHandler(IEnumerable<IContentPartDriver> contentPartDrivers, IContentTypeService contentTypeService) { + public ContentPartHandler(IEnumerable<IContentPartDriver> contentPartDrivers, IContentDefinitionManager contentDefinitionManager) { _contentPartDrivers = contentPartDrivers; - _contentTypeService = contentTypeService; + _contentDefinitionManager = contentDefinitionManager; } - protected override void Activating(ActivatingContentContext context) { - var contentTypeRecord = _contentTypeService.GetContentTypeRecord(context.ContentType); + public override void Activating(ActivatingContentContext context) { + var contentTypeRecord = _contentDefinitionManager.GetTypeDefinition(context.ContentType); if (contentTypeRecord == null) return; - var contentPartInfos = _contentPartDrivers.SelectMany(cpp => cpp.GetPartInfo()).ToList(); - - foreach (var contentTypePartRecord in contentTypeRecord.ContentParts) { - // We might have a part in the database, but the corresponding feature might not - // be enabled anymore, so we need to be resilient to that situation. - var contentPartInfo = contentPartInfos.SingleOrDefault(x => x.PartName == contentTypePartRecord.PartName.PartName); - if (contentPartInfo != null) { - context.Builder.Weld(contentPartInfo.Factory()); + foreach(var partInfo in _contentPartDrivers.SelectMany(cpp => cpp.GetPartInfo())) { + var partName = partInfo.PartName; + if (contentTypeRecord.Parts.Any(p=>p.PartDefinition.Name == partName)) { + context.Builder.Weld(partInfo.Factory()); } } } diff --git a/src/Orchard/ContentManagement/MetaData/IContentDefinitionManager.cs b/src/Orchard/ContentManagement/MetaData/IContentDefinitionManager.cs new file mode 100644 index 000000000..8b635f2a5 --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/IContentDefinitionManager.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Models; + +namespace Orchard.ContentManagement.MetaData { + public interface IContentDefinitionManager : IDependency { + IEnumerable<ContentTypeDefinition> ListTypeDefinitions(); + IEnumerable<ContentPartDefinition> ListPartDefinitions(); + + ContentTypeDefinition GetTypeDefinition(string name); + ContentPartDefinition GetPartDefinition(string name); + + void StoreTypeDefinition(ContentTypeDefinition contentTypeDefinition); + void StorePartDefinition(ContentPartDefinition contentPartDefinition); + } + + public static class ContentDefinitionManagerExtensions{ + public static void AlterTypeDefinition(this IContentDefinitionManager manager, string name, Action<ContentTypeDefinitionBuilder> alteration) { + var typeDefinition = manager.GetTypeDefinition(name) ?? new ContentTypeDefinition(name); + var builder = new ContentTypeDefinitionBuilder(typeDefinition); + alteration(builder); + manager.StoreTypeDefinition(builder.Build()); + } + public static void AlterPartDefinition(this IContentDefinitionManager manager, string name, Action<ContentPartDefinitionBuilder> alteration) { + var partDefinition = manager.GetPartDefinition(name) ?? new ContentPartDefinition(name); + var builder = new ContentPartDefinitionBuilder(partDefinition); + alteration(builder); + manager.StorePartDefinition(builder.Build()); + } + } +} + diff --git a/src/Orchard/ContentManagement/MetaData/Models/ContentFieldDefinition.cs b/src/Orchard/ContentManagement/MetaData/Models/ContentFieldDefinition.cs new file mode 100644 index 000000000..6b60c4ffd --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/Models/ContentFieldDefinition.cs @@ -0,0 +1,9 @@ +namespace Orchard.ContentManagement.MetaData.Models { + public class ContentFieldDefinition { + public ContentFieldDefinition(string name) { + Name = name; + } + + public string Name { get; private set; } + } +} diff --git a/src/Orchard/ContentManagement/MetaData/Models/ContentPartDefinition.cs b/src/Orchard/ContentManagement/MetaData/Models/ContentPartDefinition.cs new file mode 100644 index 000000000..dd8bd4e9c --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/Models/ContentPartDefinition.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Orchard.Utility.Extensions; + +namespace Orchard.ContentManagement.MetaData.Models { + public class ContentPartDefinition { + public ContentPartDefinition(string name, IEnumerable<Field> fields, IDictionary<string, string> settings) { + Name = name; + Fields = fields.ToReadOnlyCollection(); + Settings = settings; + } + + public ContentPartDefinition(string name) { + Name = name; + Fields = Enumerable.Empty<Field>(); + Settings = new Dictionary<string, string>(); + } + + public string Name { get; private set; } + public IEnumerable<Field> Fields { get; private set; } + public IDictionary<string, string> Settings { get; private set; } + + public class Field { + public Field(ContentFieldDefinition contentFieldDefinition, string name, IDictionary<string, string> settings) { + FieldDefinition = contentFieldDefinition; + Name = name; + Settings = settings; + } + + public string Name { get; private set; } + public ContentFieldDefinition FieldDefinition { get; private set; } + public IDictionary<string, string> Settings { get; private set; } + } + } +} diff --git a/src/Orchard/ContentManagement/MetaData/Models/ContentTypeDefinition.cs b/src/Orchard/ContentManagement/MetaData/Models/ContentTypeDefinition.cs new file mode 100644 index 000000000..ae9d2a114 --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/Models/ContentTypeDefinition.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; +using System.Linq; + +namespace Orchard.ContentManagement.MetaData.Models { + public class ContentTypeDefinition { + public ContentTypeDefinition(string name, IEnumerable<Part> parts, IDictionary<string, string> settings) { + Name = name; + Parts = parts; + Settings = settings; + } + + public ContentTypeDefinition(string name) { + Name = name; + Parts = Enumerable.Empty<Part>(); + Settings = new Dictionary<string, string>(); + } + + public string Name { get; private set; } + public IEnumerable<Part> Parts { get; private set; } + public IDictionary<string, string> Settings { get; private set; } + + public class Part { + public Part(ContentPartDefinition contentPartDefinition, IDictionary<string, string> settings) { + PartDefinition = contentPartDefinition; + Settings = settings; + } + + public ContentPartDefinition PartDefinition { get; private set; } + public IDictionary<string, string> Settings { get; private set; } + } + } +} diff --git a/src/Orchard/ContentManagement/MetaData/Records/ContentTypePartNameRecord.cs b/src/Orchard/ContentManagement/MetaData/Records/ContentTypePartNameRecord.cs deleted file mode 100644 index 7f0caddb2..000000000 --- a/src/Orchard/ContentManagement/MetaData/Records/ContentTypePartNameRecord.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Orchard.ContentManagement.MetaData.Records { - public class ContentTypePartNameRecord { - public virtual int Id { get; set; } - public virtual string PartName { get; set; } - } -} diff --git a/src/Orchard/ContentManagement/MetaData/Records/ContentTypePartRecord.cs b/src/Orchard/ContentManagement/MetaData/Records/ContentTypePartRecord.cs deleted file mode 100644 index e723d18e7..000000000 --- a/src/Orchard/ContentManagement/MetaData/Records/ContentTypePartRecord.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Orchard.ContentManagement.MetaData.Records { - public class ContentTypePartRecord { - public virtual int Id { get; set; } - public virtual ContentTypePartNameRecord PartName { get; set; } - } -} diff --git a/src/Orchard/ContentManagement/MetaData/Services/ContentTypeService.cs b/src/Orchard/ContentManagement/MetaData/Services/ContentTypeService.cs deleted file mode 100644 index a0b71bb20..000000000 --- a/src/Orchard/ContentManagement/MetaData/Services/ContentTypeService.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using JetBrains.Annotations; -using Orchard.ContentManagement.MetaData.Records; -using Orchard.ContentManagement.Records; -using Orchard.Data; - -namespace Orchard.ContentManagement.MetaData.Services { - [UsedImplicitly] - public class ContentTypeService : IContentTypeService { - private readonly IRepository<ContentTypeRecord> _contentTypeRepository; - private readonly IRepository<ContentTypePartNameRecord> _contentTypePartNameRepository; - private readonly IRepository<ContentTypePartRecord> _contentTypePartRepository; - - public ContentTypeService(IRepository<ContentTypePartRecord> contentTypePartRepository, IRepository<ContentTypeRecord> contentTypeRepository, IRepository<ContentTypePartNameRecord> contentTypePartNameRepository) { - _contentTypeRepository = contentTypeRepository; - _contentTypePartNameRepository = contentTypePartNameRepository; - _contentTypePartRepository = contentTypePartRepository; - } - - public ContentTypeRecord GetContentTypeRecord(string contentTypeName) { - return _contentTypeRepository.Fetch(x => x.Name == contentTypeName).SingleOrDefault(); - } - - public ContentTypePartNameRecord GetContentPartNameRecord(string name) { - return _contentTypePartNameRepository.Fetch(x => x.PartName == name).SingleOrDefault(); - } - - public IEnumerable<ContentTypeRecord> GetContentTypes() { - return _contentTypeRepository.Table.ToList(); - } - - public IEnumerable<ContentTypePartNameRecord> GetContentTypePartNames() { - return _contentTypePartNameRepository.Table.ToList(); - } - - public void MapContentTypeToContentPart(string contentType, string contentPart) { - // Create content type if needed - var contentTypeRecord = GetContentTypeRecord(contentType); - if (contentTypeRecord == null) { - contentTypeRecord = new ContentTypeRecord { Name = contentType }; - _contentTypeRepository.Create(contentTypeRecord); - } - - // Create part name if needed - var contentTypePartNameRecord = GetContentPartNameRecord(contentPart); - if (contentTypePartNameRecord == null) { - contentTypePartNameRecord = new ContentTypePartNameRecord { PartName = contentPart }; - _contentTypePartNameRepository.Create(contentTypePartNameRecord); - } - - // Add part name to content type - var contentTypePartRecord = new ContentTypePartRecord { PartName = contentTypePartNameRecord }; - contentTypeRecord.ContentParts.Add(contentTypePartRecord); - } - - public void UnMapContentTypeToContentPart(string contentType, string contentPart) { - var contentTypeRecord = GetContentTypeRecord(contentType); - var contentTypePartNameRecord = _contentTypePartNameRepository.Fetch(x => x.PartName == contentPart).Single(); - var contentTypePartRecord = contentTypeRecord.ContentParts.Single(x => x.PartName == contentTypePartNameRecord); - contentTypeRecord.ContentParts.Remove(contentTypePartRecord); - } - - public bool ValidateContentTypeToContentPartMapping(string contentType, string contentPart) { - var contentTypeRecord = GetContentTypeRecord(contentType) ?? new ContentTypeRecord(); - if (contentTypeRecord.ContentParts.Count == 0) - return false; - var contentTypePart = contentTypeRecord.ContentParts.Single(x => x.PartName.PartName == contentPart); - return contentTypePart != null; - } - - - public void AddContentTypePartNameToMetaData(string contentTypePartName) { - var contentTypePartNameRecord = new ContentTypePartNameRecord() { - PartName = contentTypePartName - }; - - _contentTypePartNameRepository.Update(contentTypePartNameRecord); - } - } -} diff --git a/src/Orchard/ContentManagement/MetaData/Services/IContentTypeService.cs b/src/Orchard/ContentManagement/MetaData/Services/IContentTypeService.cs deleted file mode 100644 index 2ab533896..000000000 --- a/src/Orchard/ContentManagement/MetaData/Services/IContentTypeService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections.Generic; -using Orchard.ContentManagement.MetaData.Records; -using Orchard.ContentManagement.Records; - -namespace Orchard.ContentManagement.MetaData.Services -{ - public interface IContentTypeService : IDependency { - void MapContentTypeToContentPart(string contentType, string contentPart); - void UnMapContentTypeToContentPart(string contentType, string contentPart); - void AddContentTypePartNameToMetaData(string contentTypePartName); - ContentTypeRecord GetContentTypeRecord(string contentTypeName); - bool ValidateContentTypeToContentPartMapping(string contentType, string contentPart); - IEnumerable<ContentTypeRecord> GetContentTypes(); - IEnumerable<ContentTypePartNameRecord> GetContentTypePartNames(); - ContentTypePartNameRecord GetContentPartNameRecord(string name); - } -} diff --git a/src/Orchard/ContentManagement/MetaData/Services/SettingsFormatter.cs b/src/Orchard/ContentManagement/MetaData/Services/SettingsFormatter.cs new file mode 100644 index 000000000..f7a32f8dc --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/Services/SettingsFormatter.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; +using System.Linq; +using System.Xml.Linq; + +namespace Orchard.ContentManagement.MetaData.Services { + public class SettingsFormatter : + IMapper<XElement, IDictionary<string, string>>, + IMapper<IDictionary<string, string>, XElement> { + + public IDictionary<string, string> Map(XElement source) { + if (source == null) + return new Dictionary<string, string>(); + + return source.Attributes().ToDictionary(attr => attr.Name.LocalName, attr => attr.Value); + } + + public XElement Map(IDictionary<string, string> source) { + if (source == null) + return new XElement("settings"); + + return new XElement("settings", source.Select(kv => new XAttribute(kv.Key, kv.Value))); + } + } +} diff --git a/src/Orchard/ContentManagement/Records/ContentTypeRecord.cs b/src/Orchard/ContentManagement/Records/ContentTypeRecord.cs index b21774f3f..5d05fdc54 100644 --- a/src/Orchard/ContentManagement/Records/ContentTypeRecord.cs +++ b/src/Orchard/ContentManagement/Records/ContentTypeRecord.cs @@ -1,15 +1,7 @@ -using System.Collections.Generic; -using Orchard.ContentManagement.MetaData.Records; -using Orchard.Data.Conventions; - -namespace Orchard.ContentManagement.Records { - public class ContentTypeRecord { - public ContentTypeRecord() { - ContentParts = new List<ContentTypePartRecord>(); - } +namespace Orchard.ContentManagement.Records { + public class ContentTypeRecord { public virtual int Id { get; set; } public virtual string Name { get; set; } - [CascadeAllDeleteOrphan] - public virtual IList<ContentTypePartRecord> ContentParts { get; set; } } + } diff --git a/src/Orchard/Data/SessionLocator.cs b/src/Orchard/Data/SessionLocator.cs index 55085321b..42aebec6a 100644 --- a/src/Orchard/Data/SessionLocator.cs +++ b/src/Orchard/Data/SessionLocator.cs @@ -47,15 +47,15 @@ namespace Orchard.Data { } bool IInterceptor.OnLoad(object entity, object id, object[] state, string[] propertyNames, IType[] types) { - return true; + return false; } bool IInterceptor.OnFlushDirty(object entity, object id, object[] currentState, object[] previousState, string[] propertyNames, IType[] types) { - return true; + return false; } bool IInterceptor.OnSave(object entity, object id, object[] state, string[] propertyNames, IType[] types) { - return true; + return false; } void IInterceptor.OnDelete(object entity, object id, object[] state, string[] propertyNames, IType[] types) { diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index f43d1f4af..80aea76e8 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -119,6 +119,7 @@ <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> <Reference Include="System.Xml" /> + <Reference Include="System.Xml.Linq" /> <Reference Include="Yaml, Version=1.0.3370.39839, Culture=neutral, PublicKeyToken=187a3d240e44a135, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\lib\yaml\Yaml.dll</HintPath> @@ -129,6 +130,211 @@ </Reference> </ItemGroup> <ItemGroup> + <Compile Include="ContentManagement\Aspects\ICommonAspect.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\ContentExtensions.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\ContentField.cs" /> + <Compile Include="ContentManagement\ContentItem.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\ContentItemMetadata.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\ContentModule.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\ContentPart.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\ContentType.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\DefaultContentManager.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\DefaultContentManagerSession.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\DefaultContentQuery.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\AutomaticContentPartDriver.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\CombinedResult.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\ContentItemDriver.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\ContentItemDriverHandler.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\ContentItemTemplateResult.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\ContentPartDriver.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\ContentPartDriverHandler.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\ContentPartTemplateResult.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\DriverResult.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Drivers\IContentItemDriver.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Extenstions\UrlHelperExtensions.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\ActivatedContentContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\ActivatingContentContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\ActivatingFilter.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\BuildDisplayModelContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\BuildEditorModelContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\ContentContextBase.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\ContentHandler.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\ContentHandlerBase.cs" /> + <Compile Include="ContentManagement\Handlers\ContentItemBuilder.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\ContentItemTemplates.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\CreateContentContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\GetContentItemMetadataContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\IContentActivatingFilter.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\IContentFilter.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\IContentHandler.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\IContentStorageFilter.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\IContentTemplateFilter.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\LoadContentContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\PublishContentContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\RemoveContentContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\StorageFilter.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\StorageFilterBase.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\StorageVersionFilter.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\TemplateFilterBase.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\TemplateFilterForRecord.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\UpdateEditorModelContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Handlers\VersionContentContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\IContent.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\IContentManager.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\IContentManagerSession.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\IContentQuery.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\IUpdateModel.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\MetaData\Builders\ContentPartDefinitionBuilder.cs" /> + <Compile Include="ContentManagement\MetaData\Builders\ContentTypeDefinitionBuilder.cs" /> + <Compile Include="ContentManagement\MetaData\ContentPartHandler.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\MetaData\ContentPartInfo.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\MetaData\IContentDefinitionManager.cs" /> + <Compile Include="ContentManagement\MetaData\Models\ContentFieldDefinition.cs" /> + <Compile Include="ContentManagement\MetaData\Models\ContentPartDefinition.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\MetaData\Models\ContentTypeDefinition.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\MetaData\Services\SettingsFormatter.cs" /> + <Compile Include="ContentManagement\Records\ContentItemAlteration.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Records\ContentItemRecord.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Records\ContentItemVersionRecord.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Records\ContentPartAlteration.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Records\ContentPartRecord.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Records\ContentPartVersionRecord.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Records\ContentTypeRecord.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Records\Utility.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\Utilities\LazyField.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ContentManagement\ViewModels\TemplateViewModel.cs"> + <SubType>Code</SubType> + </Compile> <Compile Include="Data\SessionLocator.cs" /> <Compile Include="Data\IRepository.cs" /> <Compile Include="Data\ISessionLocator.cs" /> @@ -182,10 +388,6 @@ <Compile Include="Caching\DefaultCacheManager.cs" /> <Compile Include="Caching\ICacheHolder.cs" /> <Compile Include="Caching\Weak.cs" /> - <Compile Include="ContentManagement\DefaultContentManagerSession.cs" /> - <Compile Include="ContentManagement\IContentManagerSession.cs" /> - <Compile Include="ContentManagement\MetaData\Records\ContentTypePartNameRecord.cs" /> - <Compile Include="ContentManagement\Utilities\LazyField.cs" /> <Compile Include="Environment\State\Models\ShellState.cs" /> <Compile Include="FileSystems\WebSite\WebSiteFolder.cs" /> <Compile Include="FileSystems\AppData\IAppDataFolder.cs" /> @@ -209,18 +411,6 @@ <Compile Include="Commands\ICommandHandler.cs" /> <Compile Include="Commands\OrchardSwitchAttribute.cs" /> <Compile Include="Commands\OrchardSwitchesAttribute.cs" /> - <Compile Include="ContentManagement\Aspects\ICommonAspect.cs" /> - <Compile Include="ContentManagement\Drivers\IContentItemDriver.cs" /> - <Compile Include="ContentManagement\Extenstions\UrlHelperExtensions.cs" /> - <Compile Include="ContentManagement\Handlers\ContentContextBase.cs" /> - <Compile Include="ContentManagement\Handlers\PublishContentContext.cs" /> - <Compile Include="ContentManagement\Handlers\RemoveContentContext.cs" /> - <Compile Include="ContentManagement\Handlers\VersionContentContext.cs" /> - <Compile Include="ContentManagement\MetaData\ContentPartHandler.cs" /> - <Compile Include="ContentManagement\MetaData\ContentPartInfo.cs" /> - <Compile Include="ContentManagement\MetaData\Services\ContentTypeService.cs" /> - <Compile Include="ContentManagement\MetaData\Services\IContentTypeService.cs" /> - <Compile Include="ContentManagement\MetaData\Records\ContentTypePartRecord.cs" /> <Compile Include="Data\Conventions\RecordTableNameConvention.cs" /> <Compile Include="Data\Builders\AbstractBuilder.cs" /> <Compile Include="Data\Builders\SessionFactoryBuilder.cs" /> @@ -290,60 +480,8 @@ <Compile Include="Services\IHomePageProvider.cs" /> <Compile Include="Tasks\Scheduling\IPublishingTaskManager.cs" /> <Compile Include="Tasks\Scheduling\IScheduledTask.cs" /> - <Compile Include="ContentManagement\ContentExtensions.cs" /> - <Compile Include="ContentManagement\ContentItem.cs" /> - <Compile Include="ContentManagement\ContentItemMetadata.cs" /> - <Compile Include="ContentManagement\ContentModule.cs" /> - <Compile Include="ContentManagement\ContentPart.cs" /> - <Compile Include="ContentManagement\ContentType.cs" /> - <Compile Include="ContentManagement\DefaultContentManager.cs" /> - <Compile Include="ContentManagement\DefaultContentQuery.cs" /> - <Compile Include="ContentManagement\Drivers\AutomaticContentPartDriver.cs" /> - <Compile Include="ContentManagement\Drivers\CombinedResult.cs" /> - <Compile Include="ContentManagement\Drivers\DriverResult.cs" /> - <Compile Include="ContentManagement\Drivers\ContentItemDriver.cs" /> - <Compile Include="ContentManagement\Drivers\ContentItemDriverHandler.cs" /> - <Compile Include="ContentManagement\Drivers\ContentItemTemplateResult.cs" /> - <Compile Include="ContentManagement\Drivers\ContentPartDriverHandler.cs" /> - <Compile Include="ContentManagement\Drivers\ContentPartTemplateResult.cs" /> - <Compile Include="ContentManagement\Handlers\ActivatedContentContext.cs" /> - <Compile Include="ContentManagement\Handlers\ActivatingContentContext.cs" /> - <Compile Include="ContentManagement\Handlers\ActivatingFilter.cs" /> - <Compile Include="ContentManagement\Handlers\BuildDisplayModelContext.cs" /> - <Compile Include="ContentManagement\Handlers\BuildEditorModelContext.cs" /> - <Compile Include="ContentManagement\Handlers\ContentHandler.cs" /> - <Compile Include="ContentManagement\Handlers\ContentItemBuilder.cs" /> - <Compile Include="ContentManagement\Handlers\ContentItemTemplates.cs" /> - <Compile Include="ContentManagement\Handlers\CreateContentContext.cs" /> - <Compile Include="ContentManagement\Handlers\GetContentItemMetadataContext.cs" /> - <Compile Include="ContentManagement\Handlers\IContentActivatingFilter.cs" /> - <Compile Include="ContentManagement\Handlers\IContentFilter.cs" /> - <Compile Include="ContentManagement\Handlers\IContentHandler.cs" /> - <Compile Include="ContentManagement\Handlers\IContentStorageFilter.cs" /> - <Compile Include="ContentManagement\Handlers\IContentTemplateFilter.cs" /> - <Compile Include="ContentManagement\Handlers\LoadContentContext.cs" /> - <Compile Include="ContentManagement\Handlers\StorageFilter.cs" /> - <Compile Include="ContentManagement\Handlers\StorageFilterBase.cs" /> - <Compile Include="ContentManagement\Handlers\StorageVersionFilter.cs" /> - <Compile Include="ContentManagement\Handlers\TemplateFilterBase.cs" /> - <Compile Include="ContentManagement\Handlers\TemplateFilterForRecord.cs" /> - <Compile Include="ContentManagement\Handlers\UpdateEditorModelContext.cs" /> - <Compile Include="ContentManagement\IContent.cs" /> - <Compile Include="ContentManagement\IContentManager.cs" /> - <Compile Include="ContentManagement\IContentQuery.cs" /> - <Compile Include="ContentManagement\Drivers\ContentPartDriver.cs" /> - <Compile Include="ContentManagement\IUpdateModel.cs" /> - <Compile Include="ContentManagement\Records\ContentItemRecord.cs" /> - <Compile Include="ContentManagement\Records\ContentItemAlteration.cs" /> - <Compile Include="ContentManagement\Records\ContentItemVersionRecord.cs" /> - <Compile Include="ContentManagement\Records\ContentPartRecord.cs" /> - <Compile Include="ContentManagement\Records\ContentPartAlteration.cs" /> - <Compile Include="ContentManagement\Records\ContentPartVersionRecord.cs" /> - <Compile Include="ContentManagement\Records\ContentTypeRecord.cs" /> - <Compile Include="ContentManagement\Records\Utility.cs" /> <Compile Include="Localization\Text.cs" /> <Compile Include="Mvc\ViewModels\ContentItemViewModel.cs" /> - <Compile Include="ContentManagement\ViewModels\TemplateViewModel.cs" /> <Compile Include="Data\Conventions\AttributeCollectionConvention.cs" /> <Compile Include="Data\Conventions\CascadeAllDeleteOrphanAttribute.cs" /> <Compile Include="Data\TransactionManager.cs" /> @@ -513,9 +651,7 @@ <Install>true</Install> </BootstrapperPackage> </ItemGroup> - <ItemGroup> - <Folder Include="ContentManagement\MetaData\Models\" /> - </ItemGroup> + <ItemGroup /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. From 67bf391e5b85a723a713bbdbce3dc3c09962fd04 Mon Sep 17 00:00:00 2001 From: Louis DeJardin <Louis.DeJardin@microsoft.com> Date: Fri, 4 Jun 2010 13:38:04 -0700 Subject: [PATCH 25/66] Adding a missing file. Removing an extra div. --HG-- branch : dev --- .../Parts/Common.Body.ManageWrapperPost.ascx | 1 - .../Drivers/ContentPartDriverHandler.cs | 29 +++---------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx index d39d7cc8d..18093dde3 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx @@ -1,3 +1,2 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BodyDisplayViewModel>" %> <%@ Import Namespace="Orchard.Core.Common.ViewModels"%> -</div> \ No newline at end of file diff --git a/src/Orchard/ContentManagement/Drivers/ContentPartDriverHandler.cs b/src/Orchard/ContentManagement/Drivers/ContentPartDriverHandler.cs index 3a6f67da7..eb6cc6130 100644 --- a/src/Orchard/ContentManagement/Drivers/ContentPartDriverHandler.cs +++ b/src/Orchard/ContentManagement/Drivers/ContentPartDriverHandler.cs @@ -6,7 +6,7 @@ using Orchard.Logging; namespace Orchard.ContentManagement.Drivers { [UsedImplicitly] - public class ContentPartDriverHandler : IContentHandler { + public class ContentPartDriverHandler : ContentHandlerBase { private readonly IEnumerable<IContentPartDriver> _drivers; public ContentPartDriverHandler(IEnumerable<IContentPartDriver> drivers) { @@ -16,28 +16,7 @@ namespace Orchard.ContentManagement.Drivers { public ILogger Logger { get; set; } - IEnumerable<ContentType> IContentHandler.GetContentTypes() { - return Enumerable.Empty<ContentType>(); - } - - void IContentHandler.Activating(ActivatingContentContext context) { } - void IContentHandler.Activated(ActivatedContentContext context) { } - void IContentHandler.Creating(CreateContentContext context) { } - void IContentHandler.Created(CreateContentContext context) { } - void IContentHandler.Loading(LoadContentContext context) { } - void IContentHandler.Loaded(LoadContentContext context) { } - void IContentHandler.Versioning(VersionContentContext context) { } - void IContentHandler.Versioned(VersionContentContext context) { } - void IContentHandler.Publishing(PublishContentContext context) { } - void IContentHandler.Published(PublishContentContext context) { } - void IContentHandler.Removing(RemoveContentContext context) { } - void IContentHandler.Removed(RemoveContentContext context) { } - void IContentHandler.Indexing(IndexContentContext context) { } - void IContentHandler.Indexed(IndexContentContext context) { } - - void IContentHandler.GetContentItemMetadata(GetContentItemMetadataContext context) { } - - void IContentHandler.BuildDisplayModel(BuildDisplayModelContext context) { + public override void BuildDisplayModel(BuildDisplayModelContext context) { _drivers.Invoke(driver => { var result = driver.BuildDisplayModel(context); if (result != null) @@ -45,7 +24,7 @@ namespace Orchard.ContentManagement.Drivers { }, Logger); } - void IContentHandler.BuildEditorModel(BuildEditorModelContext context) { + public override void BuildEditorModel(BuildEditorModelContext context) { _drivers.Invoke(driver => { var result = driver.BuildEditorModel(context); if (result != null) @@ -53,7 +32,7 @@ namespace Orchard.ContentManagement.Drivers { }, Logger); } - void IContentHandler.UpdateEditorModel(UpdateEditorModelContext context) { + public override void UpdateEditorModel(UpdateEditorModelContext context) { _drivers.Invoke(driver => { var result = driver.UpdateEditorModel(context); if (result != null) From 69e32f3d6b0fe2fcd9714c1d5536b530346b50b0 Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Fri, 4 Jun 2010 14:05:18 -0700 Subject: [PATCH 26/66] Re-adding an extra div (it's significant other, the extra opening div, is in another template that R# doesn't care about) --HG-- branch : dev --- .../Parts/Common.Body.ManageWrapperPost.ascx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx index 18093dde3..828f40c34 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx @@ -1,2 +1,7 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BodyDisplayViewModel>" %> <%@ Import Namespace="Orchard.Core.Common.ViewModels"%> +<%-- begin: knowingly broken HTML (hence the ManageWrapperPre and ManageWrapperPost templates) +we need "wrapper templates" (among other functionality) in the future of UI composition +please do not delete or the front end will be broken when the user is authenticated. --%> +</div> +<%-- begin: knowingly broken HTML --% \ No newline at end of file From 9ef73f84b0a2d29d4cb967d03c6440bf79f679c9 Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Fri, 4 Jun 2010 14:45:18 -0700 Subject: [PATCH 27/66] Adding some admin UI for search index management. Not yet working end-to-end but it looks like it does * * Waiting on some pieces of the index manager/provider are being added and/or reworked then we'll get it all hooked up. --HG-- branch : dev --- .../Modules/Orchard.Search/AdminMenu.cs | 16 ++++++ .../Controllers/AdminController.cs | 49 +++++++++++++++++++ .../Orchard.Search/Orchard.Search.csproj | 6 +++ .../Modules/Orchard.Search/Permissions.cs | 29 +++++++++++ .../Orchard.Search/Services/ISearchService.cs | 3 ++ .../Orchard.Search/Services/SearchService.cs | 37 +++++++++++++- .../Modules/Orchard.Search/Styles/admin.css | 3 ++ .../ViewModels/SearchIndexViewModel.cs | 10 ++++ .../Orchard.Search/Views/Admin/Index.ascx | 16 ++++++ .../Orchard.Search/Views/Search/Index.ascx | 11 ++--- .../Themes/TheAdmin/Styles/site.css | 7 +-- src/Orchard/Mvc/Html/HtmlHelperExtensions.cs | 2 +- 12 files changed, 174 insertions(+), 15 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Search/AdminMenu.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Permissions.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Styles/admin.css create mode 100644 src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchIndexViewModel.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx diff --git a/src/Orchard.Web/Modules/Orchard.Search/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Search/AdminMenu.cs new file mode 100644 index 000000000..369fcea1c --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/AdminMenu.cs @@ -0,0 +1,16 @@ +using Orchard.Localization; +using Orchard.UI.Navigation; + +namespace Orchard.Search { + public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } + public string MenuName { get { return "admin"; } } + + public void GetNavigation(NavigationBuilder builder) { + builder.Add(T("Site"), "11", + menu => menu + .Add(T("Search Index"), "10.0", item => item.Action("Index", "Admin", new {area = "Orchard.Search"}) + .Permission(Permissions.ManageSearchIndex))); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs new file mode 100644 index 000000000..852509b81 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs @@ -0,0 +1,49 @@ +using System.Web.Mvc; +using Orchard.Localization; +using Orchard.Search.Services; +using Orchard.Search.ViewModels; +using Orchard.UI.Notify; + +namespace Orchard.Search.Controllers { + public class AdminController : Controller { + private readonly ISearchService _searchService; + + public AdminController(ISearchService searchService, IOrchardServices services) { + _searchService = searchService; + Services = services; + T = NullLocalizer.Instance; + } + + public IOrchardServices Services { get; private set; } + public Localizer T { get; set; } + + public ActionResult Index() { + var viewModel = new SearchIndexViewModel {HasIndexToManage = _searchService.HasIndexToManage}; + + if (!viewModel.HasIndexToManage) + Services.Notifier.Information(T("There is not search index to manage for this site.")); + + return View(viewModel); + } + + [HttpPost] + public ActionResult Update() { + if (!Services.Authorizer.Authorize(Permissions.ManageSearchIndex, T("Not allowed to manage the search index."))) + return new HttpUnauthorizedResult(); + + _searchService.UpdateIndex(); + + return RedirectToAction("Index"); + } + + [HttpPost] + public ActionResult Rebuild() { + if (!Services.Authorizer.Authorize(Permissions.ManageSearchIndex, T("Not allowed to manage the search index."))) + return new HttpUnauthorizedResult(); + + _searchService.RebuildIndex(); + + return RedirectToAction("Index"); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj index 770b58c82..5ee797d6f 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -65,11 +65,15 @@ <Reference Include="System.EnterpriseServices" /> </ItemGroup> <ItemGroup> + <Compile Include="AdminMenu.cs" /> + <Compile Include="Controllers\AdminController.cs" /> <Compile Include="Controllers\SearchController.cs" /> <Compile Include="Filters\SearchFilter.cs" /> + <Compile Include="Permissions.cs" /> <Compile Include="Routes.cs" /> <Compile Include="Services\ISearchService.cs" /> <Compile Include="Services\SearchService.cs" /> + <Compile Include="ViewModels\SearchIndexViewModel.cs" /> <Compile Include="ViewModels\SearchResultViewModel.cs" /> <Compile Include="ViewModels\SearchViewModel.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> @@ -82,7 +86,9 @@ </ItemGroup> <ItemGroup> <Content Include="Module.txt" /> + <Content Include="Styles\admin.css" /> <Content Include="Styles\search.css" /> + <Content Include="Views\Admin\Index.ascx" /> <Content Include="Views\SearchForm.ascx" /> <Content Include="Views\Search\Index.ascx" /> <Content Include="Views\Web.config" /> diff --git a/src/Orchard.Web/Modules/Orchard.Search/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Search/Permissions.cs new file mode 100644 index 000000000..901f4ae65 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Permissions.cs @@ -0,0 +1,29 @@ +using System.Collections.Generic; +using Orchard.Security.Permissions; + +namespace Orchard.Search { + public class Permissions : IPermissionProvider { + public static readonly Permission ManageSearchIndex = new Permission { Description = "Manage Search Index", Name = "ManageSearchIndex" }; + + public string ModuleName { + get { + return "Search"; + } + } + + public IEnumerable<Permission> GetPermissions() { + return new Permission[] { + ManageSearchIndex, + }; + } + + public IEnumerable<PermissionStereotype> GetDefaultStereotypes() { + return new[] { + new PermissionStereotype { + Name = "Administrator", + Permissions = new[] {ManageSearchIndex} + }, + }; + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs index 490fcc31c..aba8ecdb0 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs @@ -3,6 +3,9 @@ using Orchard.Indexing; namespace Orchard.Search.Services { public interface ISearchService : IDependency { + bool HasIndexToManage { get; } IEnumerable<ISearchHit> Query(string term); + void RebuildIndex(); + void UpdateIndex(); } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs index 27c7b6fc7..257be8946 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs @@ -1,25 +1,58 @@ using System.Collections.Generic; using System.Linq; using Orchard.Indexing; +using Orchard.Localization; +using Orchard.UI.Notify; namespace Orchard.Search.Services { public class SearchService : ISearchService { + private const string SearchIndexName = "search"; private readonly IIndexManager _indexManager; - public SearchService(IIndexManager indexManager) { + public SearchService(IOrchardServices services, IIndexManager indexManager) { + Services = services; _indexManager = indexManager; + T = NullLocalizer.Instance; + } + + public IOrchardServices Services { get; set; } + public Localizer T { get; set; } + + public bool HasIndexToManage { + get { return _indexManager.HasIndexProvider(); } } public IEnumerable<ISearchHit> Query(string term) { if (string.IsNullOrWhiteSpace(term) || !_indexManager.HasIndexProvider()) return Enumerable.Empty<ISearchHit>(); - return _indexManager.GetSearchIndexProvider().CreateSearchBuilder("search") + return _indexManager.GetSearchIndexProvider().CreateSearchBuilder(SearchIndexName) .WithField("title", term) .WithField("body", term) .Search(); } + + public void RebuildIndex() { + if (!_indexManager.HasIndexProvider()) { + Services.Notifier.Warning(T("There is no search index to rebuild.")); + return; + } + + var searchProvider = _indexManager.GetSearchIndexProvider(); + if (searchProvider.Exists(SearchIndexName)) + searchProvider.DeleteIndex(SearchIndexName); + + searchProvider.CreateIndex(SearchIndexName); // or just reset the updated date and let the background process recreate the index + Services.Notifier.Information(T("The search index has been rebuilt.")); + } + + public void UpdateIndex() { + //todo: this + //if (_indexManager.HasIndexProvider()) + // _indexManager.GetSearchIndexProvider().UpdateIndex(SearchIndexName); + Services.Notifier.Information(T("The search index has been updated.")); + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Search/Styles/admin.css new file mode 100644 index 000000000..057874152 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Styles/admin.css @@ -0,0 +1,3 @@ +#main button { + display:block; +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchIndexViewModel.cs new file mode 100644 index 000000000..2a0637cda --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchIndexViewModel.cs @@ -0,0 +1,10 @@ +using System; +using Orchard.Mvc.ViewModels; + +namespace Orchard.Search.ViewModels { + public class SearchIndexViewModel : BaseViewModel { + public bool HasIndexToManage { get; set; } + //todo: hang the index updated date off here to show in the admin UI (e.g. -> index updated: June 4, 2010 [update index]) + public DateTime IndexUpdatedUtc { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx new file mode 100644 index 000000000..7726c2ef2 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx @@ -0,0 +1,16 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Search.ViewModels.SearchIndexViewModel>" %> +<%@ Import Namespace="Orchard.Mvc.Html" %><% +Html.RegisterStyle("admin.css"); %> +<h1><%=Html.TitleForPage(T("Search Index Mangement").ToString()) %></h1><% +using (Html.BeginForm("update", "admin", FormMethod.Post, new {area = "Orchard.Search"})) { %> + <fieldset> + <p><%=T("The search index was last updated {0}. <button type=\"submit\" title=\"Update the search index.\" class=\"primaryAction\">Update</button>", Html.DateTimeRelative(Model.IndexUpdatedUtc))%></p> + <%=Html.AntiForgeryTokenOrchard() %> + </fieldset><% +} +using (Html.BeginForm("rebuild", "admin", FormMethod.Post, new {area = "Orchard.Search"})) { %> + <fieldset> + <p><%=T("Rebuild the search index for a fresh start. <button type=\"submit\" title=\"Rebuild the search index.\">Rebuld</button>") %></p> + <%=Html.AntiForgeryTokenOrchard() %> + </fieldset><% +} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index 415dab029..e0f8681ba 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -1,14 +1,11 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Search.ViewModels.SearchViewModel>" %> <%@ Import Namespace="Orchard.Mvc.Html" %><% Html.RegisterStyle("search.css"); %> -<h1><%=Html.TitleForPage(T("Search"))%></h1> -<% -Html.Zone("search"); %><% - +<h1><%=Html.TitleForPage(T("Search"))%></h1><% +Html.Zone("search"); if (!string.IsNullOrWhiteSpace(Model.Query)) { %> - <p class="search-summary"><%=T("<em>{0}</em> results", Model.Results.Count()) %></p><% +<p class="search-summary"><%=T("<em>{0}</em> results", Model.Results.Count()) %></p><% } - if (Model.Results.Count() > 0) { %> - <%=Html.UnorderedList(Model.Results, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString(), "search-results contentItems") %><% +<%=Html.UnorderedList(Model.Results, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString(), "search-results contentItems") %><% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 59cb915bd..e692f8aeb 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -57,7 +57,6 @@ body { } button { font-family:Segoe UI,Trebuchet,Arial,Sans-Serif; - font-size:1.01em; } body#preview { min-width:0; @@ -157,6 +156,7 @@ table.items th, table.items td, table.items caption { font-size:1.4em; line-heig table.items p, table.items label, table.items input, table.items .button { font-size:1em; line-height:1em; } p .button { font-size:inherit; } .meta, .hint { font-size:1.2em; } /* 12px */ +form.link button { font-size:1.01em; } /* Links ----------------------------------------------------------*/ @@ -450,9 +450,6 @@ button, .button, .button:link, .button:visited { text-align:center; padding:0 .8em .1em; } -button { - padding-top:.08em; -} form.link button { background:inherit; border:0; @@ -681,7 +678,7 @@ table .button { .contentItems .properties .icon { margin:0 .2em -.2em; } -.contentItems .related{ +.contentItems .related { float:right; font-size:1.4em; text-align:right; diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs index 8615286b2..aabadcfb4 100644 --- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs +++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs @@ -111,7 +111,7 @@ namespace Orchard.Mvc.Html { TimeSpan time = htmlHelper.Resolve<IClock>().UtcNow - value; if (time.TotalDays > 7) - return "at " + htmlHelper.DateTime(value); + return "on " + htmlHelper.DateTime(value, "MMM d yyyy 'at' h:mm tt"); if (time.TotalHours > 24) return string.Format("{0} day{1} ago", time.Days, time.Days == 1 ? "" : "s"); if (time.TotalMinutes > 60) From 91a63dddb8725b5a60433ef1f85a34a896244eb3 Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Fri, 4 Jun 2010 14:53:10 -0700 Subject: [PATCH 28/66] Fixing a syntax error before too many people notice. Shhhh... --HG-- branch : dev --- .../DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx index 828f40c34..86cbb66fa 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx @@ -4,4 +4,4 @@ we need "wrapper templates" (among other functionality) in the future of UI composition please do not delete or the front end will be broken when the user is authenticated. --%> </div> -<%-- begin: knowingly broken HTML --% \ No newline at end of file +<%-- begin: knowingly broken HTML --%> \ No newline at end of file From d93c9274c875e64a8582f7e8f9062aa7457644d5 Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Fri, 4 Jun 2010 16:29:50 -0700 Subject: [PATCH 29/66] Store index settings on local file system instead of db, for farm scenarios --HG-- branch : dev --- .../Indexing/DefaultIndexProviderTests.cs | 12 ++++ .../Indexing/Lucene/DefaultIndexProvider.cs | 46 +++++++++++++ .../Indexing/Models/IndexingSettingsRecord.cs | 8 --- .../Indexing/Services/IndexingTaskExecutor.cs | 64 ++++++------------- .../Indexing/Services/IndexingTaskManager.cs | 43 ++----------- src/Orchard.Web/Core/Orchard.Core.csproj | 1 - src/Orchard/Indexing/IIndexProvider.cs | 14 +++- .../Tasks/Indexing/IIndexingTaskManager.cs | 5 -- 8 files changed, 95 insertions(+), 98 deletions(-) delete mode 100644 src/Orchard.Web/Core/Indexing/Models/IndexingSettingsRecord.cs diff --git a/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs b/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs index 443f8dad6..35626848d 100644 --- a/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs +++ b/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs @@ -181,5 +181,17 @@ namespace Orchard.Tests.Indexing { Assert.That(searchBuilder.Get(2).Id, Is.EqualTo(2)); Assert.That(searchBuilder.Get(3).Id, Is.EqualTo(3)); } + + [Test] + public void ProviderShouldStoreSettings() { + _provider.CreateIndex("default"); + Assert.That(_provider.GetLastIndexUtc("default"), Is.EqualTo(DefaultIndexProvider.DefaultMinDateTime)); + + _provider.SetLastIndexUtc("default", new DateTime(2010, 1, 1, 1, 1, 1, 1)); + Assert.That(_provider.GetLastIndexUtc("default"), Is.EqualTo(new DateTime(2010, 1, 1, 1, 1, 1, 0))); + + _provider.SetLastIndexUtc("default", new DateTime(1901, 1, 1, 1, 1, 1, 1)); + Assert.That(_provider.GetLastIndexUtc("default"), Is.EqualTo(DefaultIndexProvider.DefaultMinDateTime)); + } } } diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs index 9a5e01174..c449c75e3 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs @@ -13,6 +13,7 @@ using Orchard.Indexing; using Directory = Lucene.Net.Store.Directory; using Version = Lucene.Net.Util.Version; using Orchard.Logging; +using System.Xml.Linq; namespace Orchard.Core.Indexing.Lucene { /// <summary> @@ -24,6 +25,9 @@ namespace Orchard.Core.Indexing.Lucene { public static readonly Version LuceneVersion = Version.LUCENE_29; private readonly Analyzer _analyzer = new StandardAnalyzer(LuceneVersion); private readonly string _basePath; + public static readonly DateTime DefaultMinDateTime = new DateTime(1980, 1, 1); + public static readonly string Settings = "Settings"; + public static readonly string LastIndexUtc = "LastIndexedUtc"; public ILogger Logger { get; set; } @@ -37,6 +41,10 @@ namespace Orchard.Core.Indexing.Lucene { Logger = NullLogger.Instance; // Ensures the directory exists + EnsureDirectoryExists(); + } + + private void EnsureDirectoryExists() { var directory = new DirectoryInfo(_appDataFolder.MapPath(_basePath)); if(!directory.Exists) { directory.Create(); @@ -72,6 +80,11 @@ namespace Orchard.Core.Indexing.Lucene { public void DeleteIndex(string indexName) { new DirectoryInfo(Path.Combine(_appDataFolder.MapPath(Path.Combine(_basePath, indexName)))) .Delete(true); + + var settingsFileName = GetSettingsFileName(indexName); + if(File.Exists(settingsFileName)) { + File.Delete(settingsFileName); + } } public void Store(string indexName, IIndexDocument indexDocument) { @@ -148,5 +161,38 @@ namespace Orchard.Core.Indexing.Lucene { return new DefaultSearchBuilder(GetDirectory(indexName)); } + private string GetSettingsFileName(string indexName) { + return Path.Combine(_appDataFolder.MapPath(_basePath), indexName + ".settings.xml"); + } + + public DateTime GetLastIndexUtc(string indexName) { + var settingsFileName = GetSettingsFileName(indexName); + + return File.Exists(settingsFileName) + ? DateTime.Parse(XDocument.Load(settingsFileName).Descendants(LastIndexUtc).First().Value) + : DefaultMinDateTime; + } + + public void SetLastIndexUtc(string indexName, DateTime lastIndexUtc) { + if ( lastIndexUtc < DefaultMinDateTime ) { + lastIndexUtc = DefaultMinDateTime; + } + + XDocument doc; + var settingsFileName = GetSettingsFileName(indexName); + if ( !File.Exists(settingsFileName) ) { + EnsureDirectoryExists(); + doc = new XDocument( + new XElement(Settings, + new XElement(LastIndexUtc, lastIndexUtc.ToString("s")))); + } + else { + doc = XDocument.Load(settingsFileName); + doc.Element(Settings).Element(LastIndexUtc).Value = lastIndexUtc.ToString("s"); + } + + doc.Save(settingsFileName); + } + } } diff --git a/src/Orchard.Web/Core/Indexing/Models/IndexingSettingsRecord.cs b/src/Orchard.Web/Core/Indexing/Models/IndexingSettingsRecord.cs deleted file mode 100644 index 28cd06b9d..000000000 --- a/src/Orchard.Web/Core/Indexing/Models/IndexingSettingsRecord.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace Orchard.Core.Indexing.Models { - public class IndexingSettingsRecord { - public virtual int Id { get; set; } - public virtual DateTime? LatestIndexingUtc { get; set; } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs index 1b4d53035..0fcaff198 100644 --- a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs +++ b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs @@ -19,7 +19,6 @@ namespace Orchard.Core.Indexing.Services { public class IndexingTaskExecutor : IBackgroundTask { private readonly IClock _clock; private readonly IRepository<IndexingTaskRecord> _repository; - private readonly IRepository<IndexingSettingsRecord> _settings; private readonly IEnumerable<IContentHandler> _handlers; private IIndexProvider _indexProvider; private readonly IIndexManager _indexManager; @@ -29,13 +28,11 @@ namespace Orchard.Core.Indexing.Services { public IndexingTaskExecutor( IClock clock, IRepository<IndexingTaskRecord> repository, - IRepository<IndexingSettingsRecord> settings, IEnumerable<IContentHandler> handlers, IIndexManager indexManager, IContentManager contentManager) { _clock = clock; _repository = repository; - _settings = settings; _indexManager = indexManager; _handlers = handlers; _contentManager = contentManager; @@ -46,64 +43,41 @@ namespace Orchard.Core.Indexing.Services { public void Sweep() { - if ( !_indexManager.HasIndexProvider() ) { + if (!_indexManager.HasIndexProvider()) { return; } _indexProvider = _indexManager.GetSearchIndexProvider(); // retrieve last processed index time - var settingsRecord = _settings.Table.FirstOrDefault(); + var lastIndexing = _indexProvider.GetLastIndexUtc(SearchIndexName); + _indexProvider.SetLastIndexUtc(SearchIndexName, _clock.UtcNow); - if ( settingsRecord == null ) { - _settings.Create(settingsRecord = new IndexingSettingsRecord { LatestIndexingUtc = new DateTime(1980, 1, 1) }); - } - - var lastIndexing = settingsRecord.LatestIndexingUtc; - settingsRecord.LatestIndexingUtc = _clock.UtcNow; - - // retrieved not yet processed tasks + // retrieve not yet processed tasks var taskRecords = _repository.Fetch(x => x.CreatedUtc >= lastIndexing) .ToArray(); - if ( taskRecords.Length == 0 ) + if (taskRecords.Length == 0) return; Logger.Information("Processing {0} indexing tasks", taskRecords.Length); - - if ( !_indexProvider.Exists(SearchIndexName) ) { + if (!_indexProvider.Exists(SearchIndexName)) { _indexProvider.CreateIndex(SearchIndexName); } var updateIndexDocuments = new List<IIndexDocument>(); - var deleteIndexDocuments = new List<int>(); // process Delete tasks - foreach ( var taskRecord in taskRecords.Where(t => t.Action == IndexingTaskRecord.Delete) ) { - var task = new IndexingTask(_contentManager, taskRecord); - deleteIndexDocuments.Add(taskRecord.ContentItemRecord.Id); - - try { - _repository.Delete(taskRecord); - } - catch ( Exception ex ) { - Logger.Error(ex, "Could not delete task #{0}", taskRecord.Id); - } - } - - try { - if ( deleteIndexDocuments.Count > 0 ) { - _indexProvider.Delete(SearchIndexName, deleteIndexDocuments); - } + _indexProvider.Delete(SearchIndexName, taskRecords.Where(t => t.Action == IndexingTaskRecord.Delete).Select(t => t.Id)); } - catch ( Exception ex ) { - Logger.Warning(ex, "An error occured while remove a document from the index"); + catch (Exception ex) { + Logger.Warning(ex, "An error occured while removing a document from the index"); } // process Update tasks - foreach ( var taskRecord in taskRecords.Where(t => t.Action == IndexingTaskRecord.Update) ) { + foreach (var taskRecord in taskRecords.Where(t => t.Action == IndexingTaskRecord.Update)) { var task = new IndexingTask(_contentManager, taskRecord); try { @@ -113,31 +87,29 @@ namespace Orchard.Core.Indexing.Services { }; // dispatch to handlers to retrieve index information - foreach ( var handler in _handlers ) { + foreach (var handler in _handlers) { handler.Indexing(context); } updateIndexDocuments.Add(context.IndexDocument); - foreach ( var handler in _handlers ) { + foreach (var handler in _handlers) { handler.Indexed(context); } } - catch ( Exception ex ) { + catch (Exception ex) { Logger.Warning(ex, "Unable to process indexing task #{0}", taskRecord.Id); } } - try { - if ( updateIndexDocuments.Count > 0 ) { + if (updateIndexDocuments.Count > 0) { + try { _indexProvider.Store(SearchIndexName, updateIndexDocuments); } + catch (Exception ex) { + Logger.Warning(ex, "An error occured while adding a document to the index"); + } } - catch ( Exception ex ) { - Logger.Warning(ex, "An error occured while adding a document to the index"); - } - - _settings.Update(settingsRecord); } } } diff --git a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs index 1dde1d257..30eac6a59 100644 --- a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs +++ b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs @@ -16,18 +16,15 @@ namespace Orchard.Core.Indexing.Services { public class IndexingTaskManager : IIndexingTaskManager { private readonly IContentManager _contentManager; private readonly IRepository<IndexingTaskRecord> _repository; - private readonly IRepository<IndexingSettingsRecord> _settings; private readonly IClock _clock; public IndexingTaskManager( IContentManager contentManager, IRepository<IndexingTaskRecord> repository, - IRepository<IndexingSettingsRecord> settings, IClock clock) { _clock = clock; _repository = repository; _contentManager = contentManager; - _settings = settings; Logger = NullLogger.Instance; } @@ -38,14 +35,7 @@ namespace Orchard.Core.Indexing.Services { throw new ArgumentNullException("contentItem"); } - // remove previous tasks for the same content item - var tasks = _repository - .Fetch(x => x.ContentItemRecord.Id == contentItem.Id) - .ToArray(); - - foreach ( var task in tasks ) { - _repository.Delete(task); - } + DeleteTasks(contentItem); var taskRecord = new IndexingTaskRecord { CreatedUtc = _clock.UtcNow, @@ -77,37 +67,16 @@ namespace Orchard.Core.Indexing.Services { .ToReadOnlyCollection(); } - public void DeleteTasks(DateTime? createdBefore) { - Logger.Debug("Deleting Indexing tasks created before {0}", createdBefore); - - var tasks = _repository - .Fetch(x => x.CreatedUtc <= createdBefore); - - foreach (var task in tasks) { - _repository.Delete(task); - } - } - + /// <summary> + /// Removes existing tasks for the specified content item + /// </summary> public void DeleteTasks(ContentItem contentItem) { - Logger.Debug("Deleting Indexing tasks for ContentItem [{0}:{1}]", contentItem.ContentType, contentItem.Id); - var tasks = _repository - .Fetch(x => x.Id == contentItem.Id); - + .Fetch(x => x.ContentItemRecord.Id == contentItem.Id) + .ToArray(); foreach (var task in tasks) { _repository.Delete(task); } } - - public void RebuildIndex() { - var settingsRecord = _settings.Table.FirstOrDefault(); - if (settingsRecord == null) { - _settings.Create(settingsRecord = new IndexingSettingsRecord() ); - } - - settingsRecord.LatestIndexingUtc = new DateTime(1980, 1, 1); - _settings.Update(settingsRecord); - } - } } diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index b29aa2515..0132a8947 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -113,7 +113,6 @@ <Compile Include="Indexing\Lucene\DefaultIndexProvider.cs" /> <Compile Include="Indexing\Lucene\DefaultSearchBuilder.cs" /> <Compile Include="Indexing\Lucene\DefaultSearchHit.cs" /> - <Compile Include="Indexing\Models\IndexingSettingsRecord.cs" /> <Compile Include="Indexing\Models\IndexingTask.cs" /> <Compile Include="Indexing\Models\IndexingTaskRecord.cs" /> <Compile Include="Indexing\Services\CreateIndexingTaskHandler.cs" /> diff --git a/src/Orchard/Indexing/IIndexProvider.cs b/src/Orchard/Indexing/IIndexProvider.cs index 4045931e8..63a9380e7 100644 --- a/src/Orchard/Indexing/IIndexProvider.cs +++ b/src/Orchard/Indexing/IIndexProvider.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; namespace Orchard.Indexing { public interface IIndexProvider : IDependency { @@ -48,5 +49,16 @@ namespace Orchard.Indexing { /// </summary> /// <returns>A search builder instance</returns> ISearchBuilder CreateSearchBuilder(string indexName); + + /// <summary> + /// Returns the date and time when the index was last processed + /// </summary> + DateTime GetLastIndexUtc(string indexName); + + /// <summary> + /// Sets the date and time when the index was last processed + /// </summary> + void SetLastIndexUtc(string indexName, DateTime lastIndexUtc); + } } \ No newline at end of file diff --git a/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs b/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs index cdb950e0f..c469ed6e9 100644 --- a/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs +++ b/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs @@ -19,11 +19,6 @@ namespace Orchard.Tasks.Indexing { /// </summary> IEnumerable<IIndexingTask> GetTasks(DateTime? createdAfter); - /// <summary> - /// Deletes all indexing tasks previous to a specific date and time - /// </summary> - void DeleteTasks(DateTime? createdBefore); - /// <summary> /// Deletes all indexing tasks assigned to a specific content item /// </summary> From 9eebb483ae8957b0a3fcb0538b30fa373ddebc6b Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Fri, 4 Jun 2010 17:42:20 -0700 Subject: [PATCH 30/66] Implemented RebuildIndex plus UpdateIndex signal to backgroung tasks. Adapted UI. --HG-- branch : dev --- .../Indexing/DefaultIndexProviderTests.cs | 25 ++- .../Indexing/Lucene/DefaultIndexProvider.cs | 16 +- .../Indexing/Services/IndexingTaskExecutor.cs | 165 ++++++++++++------ .../Indexing/Services/IndexingTaskManager.cs | 8 +- .../Controllers/AdminController.cs | 5 +- .../Orchard.Search/Services/ISearchService.cs | 4 +- .../Orchard.Search/Services/SearchService.cs | 25 ++- .../Orchard.Search/Views/Admin/Index.ascx | 2 +- src/Orchard/Indexing/IIndexNotifierHandler.cs | 5 + src/Orchard/Indexing/IIndexProvider.cs | 5 + src/Orchard/Orchard.Framework.csproj | 1 + .../Tasks/Indexing/IIndexingTaskManager.cs | 6 +- 12 files changed, 193 insertions(+), 74 deletions(-) create mode 100644 src/Orchard/Indexing/IIndexNotifierHandler.cs diff --git a/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs b/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs index 35626848d..f92333d91 100644 --- a/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs +++ b/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs @@ -58,7 +58,11 @@ namespace Orchard.Tests.Indexing { [Test] public void IndexProviderShouldOverwriteAlreadyExistingIndex() { _provider.CreateIndex("default"); - _provider.CreateIndex("default"); + _provider.Store("default", _provider.New(1).Add("body", null)); + Assert.That(_provider.IsEmpty("default"), Is.False); + + _provider.CreateIndex("default"); + Assert.That(_provider.IsEmpty("default"), Is.True); } [Test] @@ -193,5 +197,24 @@ namespace Orchard.Tests.Indexing { _provider.SetLastIndexUtc("default", new DateTime(1901, 1, 1, 1, 1, 1, 1)); Assert.That(_provider.GetLastIndexUtc("default"), Is.EqualTo(DefaultIndexProvider.DefaultMinDateTime)); } + + [Test] + public void IsEmptyShouldBeTrueForNoneExistingIndexes() { + _provider.IsEmpty("dummy"); + Assert.That(_provider.IsEmpty("default"), Is.True); + } + + [Test] + public void IsEmptyShouldBeTrueForJustNewIndexes() { + _provider.CreateIndex("default"); + Assert.That(_provider.IsEmpty("default"), Is.True); + } + + [Test] + public void IsEmptyShouldBeFalseWhenThereIsADocument() { + _provider.CreateIndex("default"); + _provider.Store("default", _provider.New(1).Add("body", null)); + Assert.That(_provider.IsEmpty("default"), Is.False); + } } } diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs index c449c75e3..f283aed45 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs @@ -70,6 +70,21 @@ namespace Orchard.Core.Indexing.Lucene { return new DirectoryInfo(_appDataFolder.MapPath(Path.Combine(_basePath, indexName))).Exists; } + public bool IsEmpty(string indexName) { + if(!Exists(indexName)) { + return true; + } + + var reader = IndexReader.Open(GetDirectory(indexName), true); + + try { + return reader.NumDocs() == 0; + } + finally { + reader.Close(); + } + } + public void CreateIndex(string indexName) { var writer = new IndexWriter(GetDirectory(indexName), _analyzer, true, IndexWriter.MaxFieldLength.UNLIMITED); writer.Close(); @@ -118,7 +133,6 @@ namespace Orchard.Core.Indexing.Lucene { writer.Optimize(); writer.Close(); } - } public void Delete(string indexName, int documentId) { diff --git a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs index 0fcaff198..baa9b1b8d 100644 --- a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs +++ b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs @@ -10,105 +10,164 @@ using Orchard.Logging; using Orchard.Services; using Orchard.Tasks; using Orchard.Core.Indexing.Models; +using Orchard.Tasks.Indexing; +using Orchard.Indexing; namespace Orchard.Core.Indexing.Services { /// <summary> /// Contains the logic which is regularly executed to retrieve index information from multiple content handlers. /// </summary> [UsedImplicitly] - public class IndexingTaskExecutor : IBackgroundTask { + public class IndexingTaskExecutor : IBackgroundTask, IIndexNotifierHandler { private readonly IClock _clock; private readonly IRepository<IndexingTaskRecord> _repository; private readonly IEnumerable<IContentHandler> _handlers; private IIndexProvider _indexProvider; private readonly IIndexManager _indexManager; + private readonly IIndexingTaskManager _indexingTaskManager; private readonly IContentManager _contentManager; private const string SearchIndexName = "Search"; + + private readonly object _synLock = new object(); public IndexingTaskExecutor( IClock clock, IRepository<IndexingTaskRecord> repository, IEnumerable<IContentHandler> handlers, IIndexManager indexManager, + IIndexingTaskManager indexingTaskManager, IContentManager contentManager) { _clock = clock; _repository = repository; _indexManager = indexManager; _handlers = handlers; + _indexingTaskManager = indexingTaskManager; _contentManager = contentManager; Logger = NullLogger.Instance; } public ILogger Logger { get; set; } + public void UpdateIndex(string indexName) { + if (indexName == SearchIndexName) { + Sweep(); + } + } + public void Sweep() { - if (!_indexManager.HasIndexProvider()) { + if ( !System.Threading.Monitor.TryEnter(_synLock) ) { + Logger.Information("Index was requested but was already running"); return; } - _indexProvider = _indexManager.GetSearchIndexProvider(); - - // retrieve last processed index time - var lastIndexing = _indexProvider.GetLastIndexUtc(SearchIndexName); - _indexProvider.SetLastIndexUtc(SearchIndexName, _clock.UtcNow); - - // retrieve not yet processed tasks - var taskRecords = _repository.Fetch(x => x.CreatedUtc >= lastIndexing) - .ToArray(); - - if (taskRecords.Length == 0) - return; - - Logger.Information("Processing {0} indexing tasks", taskRecords.Length); - - if (!_indexProvider.Exists(SearchIndexName)) { - _indexProvider.CreateIndex(SearchIndexName); - } - - var updateIndexDocuments = new List<IIndexDocument>(); - - // process Delete tasks try { - _indexProvider.Delete(SearchIndexName, taskRecords.Where(t => t.Action == IndexingTaskRecord.Delete).Select(t => t.Id)); - } - catch (Exception ex) { - Logger.Warning(ex, "An error occured while removing a document from the index"); - } - // process Update tasks - foreach (var taskRecord in taskRecords.Where(t => t.Action == IndexingTaskRecord.Update)) { - var task = new IndexingTask(_contentManager, taskRecord); + if (!_indexManager.HasIndexProvider()) { + return; + } - try { - var context = new IndexContentContext { - ContentItem = task.ContentItem, - IndexDocument = _indexProvider.New(task.ContentItem.Id) - }; + _indexProvider = _indexManager.GetSearchIndexProvider(); + var updateIndexDocuments = new List<IIndexDocument>(); + var lastIndexing = DateTime.UtcNow; - // dispatch to handlers to retrieve index information - foreach (var handler in _handlers) { - handler.Indexing(context); + // Do we need to rebuild the full index (first time module is used, or rebuild index requested) ? + if (_indexProvider.IsEmpty(SearchIndexName)) { + Logger.Information("Rebuild index started"); + + // mark current last task, as we should process older ones (in case of rebuild index only) + lastIndexing = _indexingTaskManager.GetLastTaskDateTime(); + + // get every existing content item to index it + foreach (var contentItem in _contentManager.Query(VersionOptions.Published).List()) { + try { + var context = new IndexContentContext { + ContentItem = contentItem, + IndexDocument = _indexProvider.New(contentItem.Id) + }; + + // dispatch to handlers to retrieve index information + foreach (var handler in _handlers) { + handler.Indexing(context); + } + + updateIndexDocuments.Add(context.IndexDocument); + + foreach (var handler in _handlers) { + handler.Indexed(context); + } + } + catch (Exception ex) { + Logger.Warning(ex, "Unable to index content item #{0} during rebuild", contentItem.Id); + } } - updateIndexDocuments.Add(context.IndexDocument); + } + else { + // retrieve last processed index time + lastIndexing = _indexProvider.GetLastIndexUtc(SearchIndexName); + } - foreach (var handler in _handlers) { - handler.Indexed(context); + _indexProvider.SetLastIndexUtc(SearchIndexName, _clock.UtcNow); + + // retrieve not yet processed tasks + var taskRecords = _repository.Fetch(x => x.CreatedUtc >= lastIndexing) + .ToArray(); + + if (taskRecords.Length == 0) + return; + + Logger.Information("Processing {0} indexing tasks", taskRecords.Length); + + if (!_indexProvider.Exists(SearchIndexName)) { + _indexProvider.CreateIndex(SearchIndexName); + } + + // process Delete tasks + try { + _indexProvider.Delete(SearchIndexName, taskRecords.Where(t => t.Action == IndexingTaskRecord.Delete).Select(t => t.Id)); + } + catch (Exception ex) { + Logger.Warning(ex, "An error occured while removing a document from the index"); + } + + // process Update tasks + foreach (var taskRecord in taskRecords.Where(t => t.Action == IndexingTaskRecord.Update)) { + var task = new IndexingTask(_contentManager, taskRecord); + + try { + var context = new IndexContentContext { + ContentItem = task.ContentItem, + IndexDocument = _indexProvider.New(task.ContentItem.Id) + }; + + // dispatch to handlers to retrieve index information + foreach (var handler in _handlers) { + handler.Indexing(context); + } + + updateIndexDocuments.Add(context.IndexDocument); + + foreach (var handler in _handlers) { + handler.Indexed(context); + } + } + catch (Exception ex) { + Logger.Warning(ex, "Unable to process indexing task #{0}", taskRecord.Id); } } - catch (Exception ex) { - Logger.Warning(ex, "Unable to process indexing task #{0}", taskRecord.Id); + + if (updateIndexDocuments.Count > 0) { + try { + _indexProvider.Store(SearchIndexName, updateIndexDocuments); + } + catch (Exception ex) { + Logger.Warning(ex, "An error occured while adding a document to the index"); + } } } - - if (updateIndexDocuments.Count > 0) { - try { - _indexProvider.Store(SearchIndexName, updateIndexDocuments); - } - catch (Exception ex) { - Logger.Warning(ex, "An error occured while adding a document to the index"); - } + finally { + System.Threading.Monitor.Exit(_synLock); } } } diff --git a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs index 30eac6a59..9969920c3 100644 --- a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs +++ b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskManager.cs @@ -59,12 +59,8 @@ namespace Orchard.Core.Indexing.Services { Logger.Information("Deleting index task created for [{0}:{1}]", contentItem.ContentType, contentItem.Id); } - public IEnumerable<IIndexingTask> GetTasks(DateTime? createdAfter) { - return _repository - .Fetch(x => x.CreatedUtc > createdAfter) - .Select(x => new IndexingTask(_contentManager, x)) - .Cast<IIndexingTask>() - .ToReadOnlyCollection(); + public DateTime GetLastTaskDateTime() { + return _repository.Table.Max(t => t.CreatedUtc) ?? DateTime.MinValue; } /// <summary> diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs index 852509b81..217e1db53 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs @@ -1,4 +1,5 @@ -using System.Web.Mvc; +using System; +using System.Web.Mvc; using Orchard.Localization; using Orchard.Search.Services; using Orchard.Search.ViewModels; @@ -18,7 +19,7 @@ namespace Orchard.Search.Controllers { public Localizer T { get; set; } public ActionResult Index() { - var viewModel = new SearchIndexViewModel {HasIndexToManage = _searchService.HasIndexToManage}; + var viewModel = new SearchIndexViewModel {HasIndexToManage = _searchService.HasIndexToManage, IndexUpdatedUtc = _searchService.GetIndexUpdatedUtc()}; if (!viewModel.HasIndexToManage) Services.Notifier.Information(T("There is not search index to manage for this site.")); diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs index aba8ecdb0..5f23fb778 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using Orchard.Indexing; namespace Orchard.Search.Services { @@ -7,5 +8,6 @@ namespace Orchard.Search.Services { IEnumerable<ISearchHit> Query(string term); void RebuildIndex(); void UpdateIndex(); + DateTime GetIndexUpdatedUtc(); } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs index 257be8946..52454fb72 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using Orchard.Indexing; using Orchard.Localization; @@ -8,12 +9,14 @@ namespace Orchard.Search.Services { public class SearchService : ISearchService { - private const string SearchIndexName = "search"; + private const string SearchIndexName = "Search"; private readonly IIndexManager _indexManager; + private readonly IEnumerable<IIndexNotifierHandler> _indexNotifierHandlers; - public SearchService(IOrchardServices services, IIndexManager indexManager) { + public SearchService(IOrchardServices services, IIndexManager indexManager, IEnumerable<IIndexNotifierHandler> indexNotifierHandlers) { Services = services; _indexManager = indexManager; + _indexNotifierHandlers = indexNotifierHandlers; T = NullLocalizer.Instance; } @@ -49,10 +52,20 @@ namespace Orchard.Search.Services } public void UpdateIndex() { - //todo: this - //if (_indexManager.HasIndexProvider()) - // _indexManager.GetSearchIndexProvider().UpdateIndex(SearchIndexName); + + foreach(var handler in _indexNotifierHandlers) { + handler.UpdateIndex(SearchIndexName); + } + Services.Notifier.Information(T("The search index has been updated.")); } + + public DateTime GetIndexUpdatedUtc() { + if(!HasIndexToManage) { + return DateTime.MinValue; + } + + return _indexManager.GetSearchIndexProvider().GetLastIndexUtc(SearchIndexName); + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx index 7726c2ef2..f68e7e59b 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx @@ -10,7 +10,7 @@ using (Html.BeginForm("update", "admin", FormMethod.Post, new {area = "Orchard.S } using (Html.BeginForm("rebuild", "admin", FormMethod.Post, new {area = "Orchard.Search"})) { %> <fieldset> - <p><%=T("Rebuild the search index for a fresh start. <button type=\"submit\" title=\"Rebuild the search index.\">Rebuld</button>") %></p> + <p><%=T("Rebuild the search index for a fresh start. <button type=\"submit\" title=\"Rebuild the search index.\">Rebuild</button>") %></p> <%=Html.AntiForgeryTokenOrchard() %> </fieldset><% } %> \ No newline at end of file diff --git a/src/Orchard/Indexing/IIndexNotifierHandler.cs b/src/Orchard/Indexing/IIndexNotifierHandler.cs new file mode 100644 index 000000000..f115544d9 --- /dev/null +++ b/src/Orchard/Indexing/IIndexNotifierHandler.cs @@ -0,0 +1,5 @@ +namespace Orchard.Indexing { + public interface IIndexNotifierHandler : IEvents { + void UpdateIndex(string indexName); + } +} diff --git a/src/Orchard/Indexing/IIndexProvider.cs b/src/Orchard/Indexing/IIndexProvider.cs index 63a9380e7..121089bf7 100644 --- a/src/Orchard/Indexing/IIndexProvider.cs +++ b/src/Orchard/Indexing/IIndexProvider.cs @@ -18,6 +18,11 @@ namespace Orchard.Indexing { /// </summary> void DeleteIndex(string name); + /// <summary> + /// Whether an index is empty or not + /// </summary> + bool IsEmpty(string indexName); + /// <summary> /// Creates an empty document /// </summary> diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 80aea76e8..29b723a66 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -349,6 +349,7 @@ <Compile Include="Environment\State\IShellStateManager.cs" /> <Compile Include="Environment\State\ShellStateCoordinator.cs" /> <Compile Include="IDependency.cs" /> + <Compile Include="Indexing\IIndexNotifierHandler.cs" /> <Compile Include="Localization\Services\DefaultCultureManager.cs" /> <Compile Include="Localization\Services\DefaultResourceManager.cs" /> <Compile Include="Indexing\DefaultIndexManager.cs" /> diff --git a/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs b/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs index c469ed6e9..1bd06d54c 100644 --- a/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs +++ b/src/Orchard/Tasks/Indexing/IIndexingTaskManager.cs @@ -15,10 +15,10 @@ namespace Orchard.Tasks.Indexing { void CreateDeleteIndexTask(ContentItem contentItem); /// <summary> - /// Loads all indexing tasks created after to a specific date and time + /// Returns the Date Time of the last task created /// </summary> - IEnumerable<IIndexingTask> GetTasks(DateTime? createdAfter); - + DateTime GetLastTaskDateTime(); + /// <summary> /// Deletes all indexing tasks assigned to a specific content item /// </summary> From 76afbc9bae9acb34592905b89558ed07864b6bfc Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Fri, 4 Jun 2010 18:41:02 -0700 Subject: [PATCH 31/66] Added index commands (update, rebuild, search, stats) --HG-- branch : dev --- .../Indexing/Commands/IndexingCommands.cs | 101 ++++++++++++++++++ .../Indexing/Lucene/DefaultIndexProvider.cs | 17 ++- src/Orchard.Web/Core/Orchard.Core.csproj | 1 + src/Orchard/Indexing/IIndexProvider.cs | 5 + 4 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 src/Orchard.Web/Core/Indexing/Commands/IndexingCommands.cs diff --git a/src/Orchard.Web/Core/Indexing/Commands/IndexingCommands.cs b/src/Orchard.Web/Core/Indexing/Commands/IndexingCommands.cs new file mode 100644 index 000000000..abd6ec068 --- /dev/null +++ b/src/Orchard.Web/Core/Indexing/Commands/IndexingCommands.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Orchard.Commands; +using Orchard.ContentManagement; +using Orchard.Indexing; +using Orchard.Security; + +namespace Orchard.Core.Indexing.Commands { + public class IndexingCommands : DefaultOrchardCommandHandler { + private readonly IEnumerable<IIndexNotifierHandler> _indexNotifierHandlers; + private readonly IIndexManager _indexManager; + private const string SearchIndexName = "Search"; + + public IndexingCommands( + IEnumerable<IIndexNotifierHandler> indexNotifierHandlers, + IIndexManager indexManager) { + _indexNotifierHandlers = indexNotifierHandlers; + _indexManager = indexManager; + } + + [OrchardSwitch] + public string IndexName { get; set; } + + [OrchardSwitch] + public string Query { get; set; } + + [CommandName("index update")] + [CommandHelp("index update [/IndexName:<index name>]\r\n\t" + "Updates the index with the specified <index name>, or the search index if not specified")] + [OrchardSwitches("IndexName")] + public string Update() { + if ( !_indexManager.HasIndexProvider() ) { + return "No index available"; + } + + var indexName = String.IsNullOrWhiteSpace(IndexName) ? SearchIndexName : IndexName; + foreach ( var handler in _indexNotifierHandlers ) { + handler.UpdateIndex(indexName); + } + + return "Index is now being updated..."; + } + + [CommandName("index rebuild")] + [CommandHelp("index rebuild [/IndexName:<index name>]\r\n\t" + "Rebuilds the index with the specified <index name>, or the search index if not specified")] + [OrchardSwitches("IndexName")] + public string Rebuild() { + if ( !_indexManager.HasIndexProvider() ) { + return "No index available"; + } + + var indexName = String.IsNullOrWhiteSpace(IndexName) ? SearchIndexName : IndexName; + var searchProvider = _indexManager.GetSearchIndexProvider(); + if ( searchProvider.Exists(indexName) ) + searchProvider.DeleteIndex(indexName); + + searchProvider.CreateIndex(indexName); + return "Index is now being rebuilt..."; + } + + [CommandName("index search")] + [CommandHelp("index search /Query:<query> [/IndexName:<index name>]\r\n\t" + "Searches the specified <query> terms in the index with the specified <index name>, or in the search index if not specified")] + [OrchardSwitches("Query,IndexName")] + public string Search() { + if ( !_indexManager.HasIndexProvider() ) { + return "No index available"; + } + var indexName = String.IsNullOrWhiteSpace(IndexName) ? SearchIndexName : IndexName; + var searchBuilder = _indexManager.GetSearchIndexProvider().CreateSearchBuilder(indexName); + var results = searchBuilder.WithField("body", Query).WithField("title", Query).Search(); + + Context.Output.WriteLine("{0} result{1}\r\n-----------------\r\n", results.Count(), results.Count() > 0 ? "s" : ""); + + Context.Output.WriteLine("┌──────────────────────────────────────────────────────────────┬────────┐"); + Context.Output.WriteLine("│ {0} │ {1,6} │", "Title" + new string(' ', 60 - "Title".Length), "Score"); + Context.Output.WriteLine("├──────────────────────────────────────────────────────────────┼────────┤"); + foreach ( var searchHit in results ) { + var title = searchHit.GetString("title"); + title = title.Substring(0, Math.Min(60, title.Length)) ?? "- no title -"; + var score = searchHit.Score; + Context.Output.WriteLine("│ {0} │ {1,6} │", title + new string(' ', 60 - title.Length), score); + } + Context.Output.WriteLine("└──────────────────────────────────────────────────────────────┴────────┘"); + + Context.Output.WriteLine(); + return "End of search results"; + } + + [CommandName("index stats")] + [CommandHelp("index stats [/IndexName:<index name>]\r\n\t" + "Displays some statistics about the index with the specified <index name>, or in the search index if not specified")] + [OrchardSwitches("IndexName")] + public string Stats() { + if ( !_indexManager.HasIndexProvider() ) { + return "No index available"; + } + var indexName = String.IsNullOrWhiteSpace(IndexName) ? SearchIndexName : IndexName; + Context.Output.WriteLine("Number of indexed documents: {0}", _indexManager.GetSearchIndexProvider().NumDocs(indexName)); + return ""; + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs index f283aed45..7c9f9d8ce 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs @@ -71,7 +71,7 @@ namespace Orchard.Core.Indexing.Lucene { } public bool IsEmpty(string indexName) { - if(!Exists(indexName)) { + if ( !Exists(indexName) ) { return true; } @@ -85,6 +85,21 @@ namespace Orchard.Core.Indexing.Lucene { } } + public int NumDocs(string indexName) { + if ( !Exists(indexName) ) { + return 0; + } + + var reader = IndexReader.Open(GetDirectory(indexName), true); + + try { + return reader.NumDocs(); + } + finally { + reader.Close(); + } + } + public void CreateIndex(string indexName) { var writer = new IndexWriter(GetDirectory(indexName), _analyzer, true, IndexWriter.MaxFieldLength.UNLIMITED); writer.Close(); diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 0132a8947..0784d1b15 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -109,6 +109,7 @@ <Compile Include="Feeds\Rss\RssResult.cs" /> <Compile Include="HomePage\Controllers\HomeController.cs" /> <Compile Include="HomePage\Routes.cs" /> + <Compile Include="Indexing\Commands\IndexingCommands.cs" /> <Compile Include="Indexing\Lucene\DefaultIndexDocument.cs" /> <Compile Include="Indexing\Lucene\DefaultIndexProvider.cs" /> <Compile Include="Indexing\Lucene\DefaultSearchBuilder.cs" /> diff --git a/src/Orchard/Indexing/IIndexProvider.cs b/src/Orchard/Indexing/IIndexProvider.cs index 121089bf7..d873b1a13 100644 --- a/src/Orchard/Indexing/IIndexProvider.cs +++ b/src/Orchard/Indexing/IIndexProvider.cs @@ -23,6 +23,11 @@ namespace Orchard.Indexing { /// </summary> bool IsEmpty(string indexName); + /// <summary> + /// Gets the number of indexed documents + /// </summary> + int NumDocs(string indexName); + /// <summary> /// Creates an empty document /// </summary> From a1be3efecb6aec67253459cb45937e42d6e4f459 Mon Sep 17 00:00:00 2001 From: Renaud Paquay <rpaquay@microsoft.com> Date: Fri, 4 Jun 2010 19:13:57 -0700 Subject: [PATCH 32/66] Module loading strategies Make the precompiled and dynamic extension loaders work properly and also refactor some code to introduce proper abstractions, such as IVirtualPathProvider, IHostEnvironment, IBuildManager, etc. --HG-- branch : dev --- src/Orchard.Web/Web.config | 2 +- .../CSharpExtensionBuildProvider.cs | 4 +- .../CSharpExtensionCompiler.cs | 3 +- .../CSharpProjectFullTrustCompiler.cs | 15 +-- .../CSharpProjectMediumTrustCompiler.cs | 6 +- .../CSharpProjectParser.cs | 21 +++- .../Extensions/Loaders/AreaExtensionLoader.cs | 2 +- .../Extensions/Loaders/CoreExtensionLoader.cs | 14 ++- .../Loaders/DynamicExtensionLoader.cs | 78 ++++--------- .../Extensions/Loaders/IBuildManager.cs | 16 --- .../Loaders/IVirtualPathProvider.cs | 30 ----- .../Loaders/PrecompiledExtensionLoader.cs | 38 ++++-- .../Loaders/ProbingExtensionLoader.cs | 30 +++++ .../Loaders/ReferencedExtensionLoader.cs | 13 ++- .../Loaders => }/IAssemblyBuilder.cs | 2 +- src/Orchard/Environment/IBuildManager.cs | 21 ++++ src/Orchard/Environment/IHostEnvironment.cs | 22 ++++ .../Environment/IVirtualPathProvider.cs | 50 ++++++++ src/Orchard/Environment/OrchardStarter.cs | 6 + .../Dependencies/IDependenciesFolder.cs | 110 ++++++++++++++++++ src/Orchard/Orchard.Framework.csproj | 19 +-- 21 files changed, 355 insertions(+), 147 deletions(-) rename src/Orchard/Environment/Extensions/{Loaders => Compilers}/CSharpExtensionBuildProvider.cs (83%) rename src/Orchard/Environment/Extensions/{Loaders => Compilers}/CSharpExtensionCompiler.cs (93%) rename src/Orchard/Environment/Extensions/{Loaders => Compilers}/CSharpProjectFullTrustCompiler.cs (77%) rename src/Orchard/Environment/Extensions/{Loaders => Compilers}/CSharpProjectMediumTrustCompiler.cs (93%) rename src/Orchard/Environment/Extensions/{Loaders => Compilers}/CSharpProjectParser.cs (66%) delete mode 100644 src/Orchard/Environment/Extensions/Loaders/IBuildManager.cs delete mode 100644 src/Orchard/Environment/Extensions/Loaders/IVirtualPathProvider.cs create mode 100644 src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs rename src/Orchard/Environment/{Extensions/Loaders => }/IAssemblyBuilder.cs (90%) create mode 100644 src/Orchard/Environment/IBuildManager.cs create mode 100644 src/Orchard/Environment/IHostEnvironment.cs create mode 100644 src/Orchard/Environment/IVirtualPathProvider.cs create mode 100644 src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index 3413572ba..df511b385 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -28,7 +28,7 @@ --> <compilation debug="true" targetFramework="4.0"> <buildProviders> - <add extension=".csproj" type="Orchard.Environment.Extensions.Loaders.CSharpExtensionBuildProvider"/> + <add extension=".csproj" type="Orchard.Environment.Extensions.Compilers.CSharpExtensionBuildProvider"/> </buildProviders> <assemblies> <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionBuildProvider.cs b/src/Orchard/Environment/Extensions/Compilers/CSharpExtensionBuildProvider.cs similarity index 83% rename from src/Orchard/Environment/Extensions/Loaders/CSharpExtensionBuildProvider.cs rename to src/Orchard/Environment/Extensions/Compilers/CSharpExtensionBuildProvider.cs index 92ce7357f..826eccc64 100644 --- a/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionBuildProvider.cs +++ b/src/Orchard/Environment/Extensions/Compilers/CSharpExtensionBuildProvider.cs @@ -1,6 +1,6 @@ using System.Web.Compilation; -namespace Orchard.Environment.Extensions.Loaders { +namespace Orchard.Environment.Extensions.Compilers { public class CSharpExtensionBuildProvider : BuildProvider { private readonly CompilerType _codeCompilerType; @@ -11,7 +11,7 @@ namespace Orchard.Environment.Extensions.Loaders { public override CompilerType CodeCompilerType { get { return _codeCompilerType; } } public override void GenerateCode(AssemblyBuilder assemblyBuilder) { - var virtualPathProvider = new AspNetVirtualPathProvider(); + var virtualPathProvider = new DefaultVirtualPathProvider(); var compiler = new CSharpProjectMediumTrustCompiler(virtualPathProvider); var aspNetAssemblyBuilder = new AspNetAssemblyBuilder(assemblyBuilder, this); diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionCompiler.cs b/src/Orchard/Environment/Extensions/Compilers/CSharpExtensionCompiler.cs similarity index 93% rename from src/Orchard/Environment/Extensions/Loaders/CSharpExtensionCompiler.cs rename to src/Orchard/Environment/Extensions/Compilers/CSharpExtensionCompiler.cs index b4f6d380a..b267831db 100644 --- a/src/Orchard/Environment/Extensions/Loaders/CSharpExtensionCompiler.cs +++ b/src/Orchard/Environment/Extensions/Compilers/CSharpExtensionCompiler.cs @@ -4,9 +4,8 @@ using System.IO; using System.Linq; using System.Reflection; using System.Web.Compilation; -using System.Web.Hosting; -namespace Orchard.Environment.Extensions.Loaders { +namespace Orchard.Environment.Extensions.Compilers { /// <summary> /// Compile a C# extension into an assembly given a directory location /// </summary> diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpProjectFullTrustCompiler.cs b/src/Orchard/Environment/Extensions/Compilers/CSharpProjectFullTrustCompiler.cs similarity index 77% rename from src/Orchard/Environment/Extensions/Loaders/CSharpProjectFullTrustCompiler.cs rename to src/Orchard/Environment/Extensions/Compilers/CSharpProjectFullTrustCompiler.cs index 4977434a2..d8d0ced8c 100644 --- a/src/Orchard/Environment/Extensions/Loaders/CSharpProjectFullTrustCompiler.cs +++ b/src/Orchard/Environment/Extensions/Compilers/CSharpProjectFullTrustCompiler.cs @@ -1,9 +1,9 @@ using System.CodeDom.Compiler; using System.Collections.Generic; +using System.IO; using System.Linq; -using System.Reflection; -namespace Orchard.Environment.Extensions.Loaders { +namespace Orchard.Environment.Extensions.Compilers { /// <summary> /// Compile a C# extension into an assembly given a directory location /// </summary> @@ -20,15 +20,17 @@ namespace Orchard.Environment.Extensions.Loaders { /// Compile a csproj file given its virtual path. Use the CSharp CodeDomProvider /// class, which is only available in full trust. /// </summary> - public CompilerResults CompileProject(string virtualPath) { + public CompilerResults CompileProject(string virtualPath, string outputDirectory) { var codeProvider = CodeDomProvider.CreateProvider("cs"); var directory = _virtualPathProvider.GetDirectoryName(virtualPath); using (var stream = _virtualPathProvider.OpenFile(virtualPath)) { var descriptor = new CSharpProjectParser().Parse(stream); - var references = GetAssemblyReferenceNames(); + var references = GetReferencedAssembliesLocation(); var options = new CompilerParameters(references.ToArray()); + options.GenerateExecutable = false; + options.OutputAssembly = Path.Combine(outputDirectory, descriptor.AssemblyName + ".dll"); var fileNames = descriptor.SourceFilenames .Select(f => _virtualPathProvider.Combine(directory, f)) @@ -39,11 +41,10 @@ namespace Orchard.Environment.Extensions.Loaders { } } - private IEnumerable<string> GetAssemblyReferenceNames() { + private IEnumerable<string> GetReferencedAssembliesLocation() { return _buildManager.GetReferencedAssemblies() - .OfType<Assembly>() - .Where(a => !string.IsNullOrEmpty(a.Location)) .Select(a => a.Location) + .Where(a => !string.IsNullOrEmpty(a)) .Distinct(); } } diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpProjectMediumTrustCompiler.cs b/src/Orchard/Environment/Extensions/Compilers/CSharpProjectMediumTrustCompiler.cs similarity index 93% rename from src/Orchard/Environment/Extensions/Loaders/CSharpProjectMediumTrustCompiler.cs rename to src/Orchard/Environment/Extensions/Compilers/CSharpProjectMediumTrustCompiler.cs index b8d611d6e..1ab94e637 100644 --- a/src/Orchard/Environment/Extensions/Loaders/CSharpProjectMediumTrustCompiler.cs +++ b/src/Orchard/Environment/Extensions/Compilers/CSharpProjectMediumTrustCompiler.cs @@ -1,10 +1,8 @@ -using System; -using System.CodeDom; +using System.CodeDom; using System.IO; using System.Linq; - -namespace Orchard.Environment.Extensions.Loaders { +namespace Orchard.Environment.Extensions.Compilers { /// <summary> /// Compile a C# extension into an assembly given a directory location /// </summary> diff --git a/src/Orchard/Environment/Extensions/Loaders/CSharpProjectParser.cs b/src/Orchard/Environment/Extensions/Compilers/CSharpProjectParser.cs similarity index 66% rename from src/Orchard/Environment/Extensions/Loaders/CSharpProjectParser.cs rename to src/Orchard/Environment/Extensions/Compilers/CSharpProjectParser.cs index d367c0886..1c0288149 100644 --- a/src/Orchard/Environment/Extensions/Loaders/CSharpProjectParser.cs +++ b/src/Orchard/Environment/Extensions/Compilers/CSharpProjectParser.cs @@ -4,25 +4,40 @@ using System.Linq; using System.Xml; using System.Xml.Linq; -namespace Orchard.Environment.Extensions.Loaders { +namespace Orchard.Environment.Extensions.Compilers { public class CSharpProjectDescriptor { + public string AssemblyName { get; set; } public IEnumerable<string> SourceFilenames { get; set; } public IEnumerable<ReferenceDescriptor> References { get; set; } } public class ReferenceDescriptor { public string AssemblyName { get; set; } + + public override string ToString() { + return "{" + (AssemblyName ?? "") + "}"; + } } public class CSharpProjectParser { public CSharpProjectDescriptor Parse(Stream stream) { var document = XDocument.Load(XmlReader.Create(stream)); return new CSharpProjectDescriptor { - SourceFilenames = GetSourceFilenames(document), - References = GetReferences(document) + AssemblyName = GetAssemblyName(document), + SourceFilenames = GetSourceFilenames(document).ToArray(), + References = GetReferences(document).ToArray() }; } + private string GetAssemblyName(XDocument document) { + return document + .Elements(ns("Project")) + .Elements(ns("PropertyGroup")) + .Elements(ns("AssemblyName")) + .Single() + .Value; + } + private IEnumerable<string> GetSourceFilenames(XDocument document) { return document .Elements(ns("Project")) diff --git a/src/Orchard/Environment/Extensions/Loaders/AreaExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/AreaExtensionLoader.cs index 181c32dbf..5323212b7 100644 --- a/src/Orchard/Environment/Extensions/Loaders/AreaExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/AreaExtensionLoader.cs @@ -5,7 +5,7 @@ using Orchard.Environment.Extensions.Models; namespace Orchard.Environment.Extensions.Loaders { public class AreaExtensionLoader : IExtensionLoader { - public int Order { get { return 5; } } + public int Order { get { return 50; } } public ExtensionEntry Load(ExtensionDescriptor descriptor) { if (descriptor.Location == "~/Areas") { diff --git a/src/Orchard/Environment/Extensions/Loaders/CoreExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/CoreExtensionLoader.cs index 856df10f0..ba36c7f6c 100644 --- a/src/Orchard/Environment/Extensions/Loaders/CoreExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/CoreExtensionLoader.cs @@ -4,18 +4,20 @@ using System.Reflection; using Orchard.Environment.Extensions.Models; namespace Orchard.Environment.Extensions.Loaders { + /// <summary> + /// Load an extension by looking into specific namespaces of the "Orchard.Core" assembly + /// </summary> public class CoreExtensionLoader : IExtensionLoader { - public int Order { get { return 1; } } + public int Order { get { return 10; } } public ExtensionEntry Load(ExtensionDescriptor descriptor) { if (descriptor.Location == "~/Core") { - var assembly = Assembly.Load("Orchard.Core"); return new ExtensionEntry { - Descriptor = descriptor, - Assembly = assembly, - ExportedTypes = assembly.GetExportedTypes().Where(x => IsTypeFromModule(x, descriptor)) - }; + Descriptor = descriptor, + Assembly = assembly, + ExportedTypes = assembly.GetExportedTypes().Where(x => IsTypeFromModule(x, descriptor)) + }; } return null; } diff --git a/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs index 64ca1a891..fd000783c 100644 --- a/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs @@ -1,64 +1,36 @@ using System; -using System.IO; -using System.Reflection; -using System.Web.Compilation; -using System.Web.Hosting; using Orchard.Environment.Extensions.Models; +using Orchard.FileSystems.Dependencies; namespace Orchard.Environment.Extensions.Loaders { public class DynamicExtensionLoader : IExtensionLoader { - public int Order { get { return 10; } } + private readonly IHostEnvironment _hostEnvironment; + private readonly IBuildManager _buildManager; + private readonly IVirtualPathProvider _virtualPathProvider; + private readonly IDependenciesFolder _dependenciesFolder; - public ExtensionEntry Load(ExtensionDescriptor descriptor) { - if (HostingEnvironment.IsHosted == false) - return null; - - // 1) Try to load the assembly directory - // This will look in the "App_Data/Dependencies" directory if - // the probing path is correctly configured in Web.config - { - try { - Assembly assembly = Assembly.Load(descriptor.Name); - return CreateExtensionEntry(descriptor, assembly); - } - catch (FileNotFoundException e) { - // The assembly is not in one of the probing directory, - // including "App_Data/Dependencies", we need to move on - // to other strageties - } - } - - // 2) look for the assembly in the "Bin" directory - { - string modulePath = HostingEnvironment.MapPath(descriptor.Location); - modulePath = Path.Combine(modulePath, descriptor.Name); - string moduleBinary = Path.Combine(modulePath, "bin"); - moduleBinary = Path.Combine(moduleBinary, descriptor.Name + ".dll"); - if (File.Exists(moduleBinary)) { - // Copy file to dependencies directory - string dependenciesPath = HostingEnvironment.MapPath("~/App_Data/Dependencies"); - if (!Directory.Exists(dependenciesPath)) { - Directory.CreateDirectory(dependenciesPath); - } - string destFile = Path.Combine(dependenciesPath, descriptor.Name + ".dll"); - File.Copy(moduleBinary, destFile, true); - - // then load the assembly - Assembly assembly = Assembly.Load(descriptor.Name); - return CreateExtensionEntry(descriptor, assembly); - } - } - - // 3) look for the csproj in the module directory - { - string projfileName = Path.Combine(descriptor.Location, descriptor.Name); - projfileName = Path.Combine(projfileName, descriptor.Name + ".csproj").Replace('\\', '/'); - var assembly = BuildManager.GetCompiledAssembly(projfileName); - return CreateExtensionEntry(descriptor, assembly); - } + public DynamicExtensionLoader(IHostEnvironment hostEnvironment, IBuildManager buildManager, IVirtualPathProvider virtualPathProvider, IDependenciesFolder dependenciesFolder) { + _hostEnvironment = hostEnvironment; + _buildManager = buildManager; + _virtualPathProvider = virtualPathProvider; + _dependenciesFolder = dependenciesFolder; } - private static ExtensionEntry CreateExtensionEntry(ExtensionDescriptor descriptor, Assembly assembly) { + public int Order { get { return 100; } } + + public ExtensionEntry Load(ExtensionDescriptor descriptor) { + string projectPath = _virtualPathProvider.Combine(descriptor.Location, descriptor.Name, + descriptor.Name + ".csproj"); + if (!_virtualPathProvider.FileExists(projectPath)) { + return null; + } + + var assembly = _buildManager.GetCompiledAssembly(projectPath); + + if (_hostEnvironment.IsFullTrust) { + _dependenciesFolder.StoreAssemblyFile(descriptor.Name, assembly.Location); + } + return new ExtensionEntry { Descriptor = descriptor, Assembly = assembly, diff --git a/src/Orchard/Environment/Extensions/Loaders/IBuildManager.cs b/src/Orchard/Environment/Extensions/Loaders/IBuildManager.cs deleted file mode 100644 index af638f9d6..000000000 --- a/src/Orchard/Environment/Extensions/Loaders/IBuildManager.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Linq; -using System.Collections.Generic; -using System.Web.Compilation; - -namespace Orchard.Environment.Extensions.Loaders { - public interface IBuildManager { - IEnumerable<string> GetReferencedAssemblies(); - } - - public class AspNetBuildManager : IBuildManager { - public IEnumerable<string> GetReferencedAssemblies() { - return BuildManager.GetReferencedAssemblies().Cast<string>(); - } - } -} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/IVirtualPathProvider.cs b/src/Orchard/Environment/Extensions/Loaders/IVirtualPathProvider.cs deleted file mode 100644 index 79f7d0a9e..000000000 --- a/src/Orchard/Environment/Extensions/Loaders/IVirtualPathProvider.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.IO; -using System.Web.Hosting; - -namespace Orchard.Environment.Extensions.Loaders { - public interface IVirtualPathProvider { - string GetDirectoryName(string virtualPath); - string Combine(params string[] paths); - Stream OpenFile(string virtualPath); - string MapPath(string virtualPath); - } - - public class AspNetVirtualPathProvider : IVirtualPathProvider { - public string GetDirectoryName(string virtualPath) { - return Path.GetDirectoryName(virtualPath); - } - - public string Combine(params string[] paths) { - return Path.Combine(paths).Replace('\\', '/'); - } - - public Stream OpenFile(string virtualPath) { - return VirtualPathProvider.OpenFile(virtualPath); - } - - public string MapPath(string virtualPath) { - return HostingEnvironment.MapPath(virtualPath); - } - } -} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs index 3f7a30ee2..5d24d8205 100644 --- a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs @@ -1,17 +1,39 @@ using Orchard.Environment.Extensions.Models; +using Orchard.FileSystems.Dependencies; namespace Orchard.Environment.Extensions.Loaders { + /// <summary> + /// Load an extension by looking into the "bin" subdirectory of an + /// extension directory. + /// </summary> public class PrecompiledExtensionLoader : IExtensionLoader { - public int Order { get { return 3; } } + private readonly IDependenciesFolder _folder; + private readonly IVirtualPathProvider _virtualPathProvider; + + public PrecompiledExtensionLoader(IDependenciesFolder folder, IVirtualPathProvider virtualPathProvider) { + _folder = folder; + _virtualPathProvider = virtualPathProvider; + } + + public int Order { get { return 40; } } public ExtensionEntry Load(ExtensionDescriptor descriptor) { - //var assembly = Assembly.Load(descriptor.Name); - //return new ModuleEntry { - // Descriptor = descriptor, - // Assembly = assembly, - // ExportedTypes = assembly.GetExportedTypes() - //}; - return null; + var extensionPath = _virtualPathProvider.Combine(descriptor.Location, descriptor.Name, "bin", + descriptor.Name + ".dll"); + if (!_virtualPathProvider.FileExists(extensionPath)) + return null; + + _folder.StoreAssemblyFile(descriptor.Name, _virtualPathProvider.MapPath(extensionPath)); + + var assembly = _folder.LoadAssembly(descriptor.Name); + if (assembly == null) + return null; + + return new ExtensionEntry { + Descriptor = descriptor, + Assembly = assembly, + ExportedTypes = assembly.GetExportedTypes() + }; } } } \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs new file mode 100644 index 000000000..12b40c516 --- /dev/null +++ b/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs @@ -0,0 +1,30 @@ +using Orchard.Environment.Extensions.Models; +using Orchard.FileSystems.Dependencies; + +namespace Orchard.Environment.Extensions.Loaders { + /// <summary> + /// Load an extension using the "Assembly.Load" method if the + /// file can be found in the "App_Data/Dependencies" folder. + /// </summary> + public class ProbingExtensionLoader : IExtensionLoader { + private readonly IDependenciesFolder _folder; + + public ProbingExtensionLoader(IDependenciesFolder folder) { + _folder = folder; + } + + public int Order { get { return 30; } } + + public ExtensionEntry Load(ExtensionDescriptor descriptor) { + var assembly = _folder.LoadAssembly(descriptor.Name); + if (assembly == null) + return null; + + return new ExtensionEntry { + Descriptor = descriptor, + Assembly = assembly, + ExportedTypes = assembly.GetExportedTypes() + }; + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs index 4aa7ce345..39b8a19f0 100644 --- a/src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs @@ -5,8 +5,11 @@ using System.Web.Hosting; using Orchard.Environment.Extensions.Models; namespace Orchard.Environment.Extensions.Loaders { + /// <summary> + /// Load an extension by looking through the BuildManager referenced assemblies + /// </summary> public class ReferencedExtensionLoader : IExtensionLoader { - public int Order { get { return 2; } } + public int Order { get { return 20; } } public ExtensionEntry Load(ExtensionDescriptor descriptor) { if (HostingEnvironment.IsHosted == false) @@ -20,10 +23,10 @@ namespace Orchard.Environment.Extensions.Loaders { return null; return new ExtensionEntry { - Descriptor = descriptor, - Assembly = assembly, - ExportedTypes = assembly.GetExportedTypes() - }; + Descriptor = descriptor, + Assembly = assembly, + ExportedTypes = assembly.GetExportedTypes() + }; } } } \ No newline at end of file diff --git a/src/Orchard/Environment/Extensions/Loaders/IAssemblyBuilder.cs b/src/Orchard/Environment/IAssemblyBuilder.cs similarity index 90% rename from src/Orchard/Environment/Extensions/Loaders/IAssemblyBuilder.cs rename to src/Orchard/Environment/IAssemblyBuilder.cs index b2e434f33..055fb1caa 100644 --- a/src/Orchard/Environment/Extensions/Loaders/IAssemblyBuilder.cs +++ b/src/Orchard/Environment/IAssemblyBuilder.cs @@ -1,7 +1,7 @@ using System.CodeDom; using System.Web.Compilation; -namespace Orchard.Environment.Extensions.Loaders { +namespace Orchard.Environment { public interface IAssemblyBuilder { void AddCodeCompileUnit(CodeCompileUnit compileUnit); } diff --git a/src/Orchard/Environment/IBuildManager.cs b/src/Orchard/Environment/IBuildManager.cs new file mode 100644 index 000000000..625e7190a --- /dev/null +++ b/src/Orchard/Environment/IBuildManager.cs @@ -0,0 +1,21 @@ +using System.Linq; +using System.Collections.Generic; +using System.Reflection; +using System.Web.Compilation; + +namespace Orchard.Environment { + public interface IBuildManager : IDependency { + IEnumerable<Assembly> GetReferencedAssemblies(); + Assembly GetCompiledAssembly(string virtualPath); + } + + public class DefaultBuildManager : IBuildManager { + public IEnumerable<Assembly> GetReferencedAssemblies() { + return BuildManager.GetReferencedAssemblies().OfType<Assembly>(); + } + + public Assembly GetCompiledAssembly(string virtualPath) { + return BuildManager.GetCompiledAssembly(virtualPath); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/IHostEnvironment.cs b/src/Orchard/Environment/IHostEnvironment.cs new file mode 100644 index 000000000..694bc5cc0 --- /dev/null +++ b/src/Orchard/Environment/IHostEnvironment.cs @@ -0,0 +1,22 @@ +using System; +using System.Web.Hosting; + +namespace Orchard.Environment { + /// <summary> + /// Abstraction of the running environment + /// </summary> + public interface IHostEnvironment : IDependency { + bool IsFullTrust { get; } + string MapPath(string virtualPath); + } + + public class DefaultHostEnvironment : IHostEnvironment { + public bool IsFullTrust { + get { return AppDomain.CurrentDomain.IsFullyTrusted; } + } + + public string MapPath(string virtualPath) { + return HostingEnvironment.MapPath(virtualPath); + } + } +} diff --git a/src/Orchard/Environment/IVirtualPathProvider.cs b/src/Orchard/Environment/IVirtualPathProvider.cs new file mode 100644 index 000000000..37b824e39 --- /dev/null +++ b/src/Orchard/Environment/IVirtualPathProvider.cs @@ -0,0 +1,50 @@ +using System.IO; +using System.Web.Hosting; +using Orchard.Caching; + +namespace Orchard.Environment { + public interface IVirtualPathProvider : IVolatileProvider { + string GetDirectoryName(string virtualPath); + string Combine(params string[] paths); + Stream OpenFile(string virtualPath); + StreamWriter CreateText(string virtualPath); + string MapPath(string virtualPath); + bool FileExists(string virtualPath); + bool DirectoryExists(string virtualPath); + void CreateDirectory(string virtualPath); + } + + public class DefaultVirtualPathProvider : IVirtualPathProvider { + public string GetDirectoryName(string virtualPath) { + return Path.GetDirectoryName(virtualPath).Replace('\\', '/'); + } + + public string Combine(params string[] paths) { + return Path.Combine(paths).Replace('\\', '/'); + } + + public Stream OpenFile(string virtualPath) { + return HostingEnvironment.VirtualPathProvider.GetFile(virtualPath).Open(); + } + + public StreamWriter CreateText(string virtualPath) { + return File.CreateText(MapPath(virtualPath)); + } + + public string MapPath(string virtualPath) { + return HostingEnvironment.MapPath(virtualPath); + } + + public bool FileExists(string virtualPath) { + return HostingEnvironment.VirtualPathProvider.FileExists(virtualPath); + } + + public bool DirectoryExists(string virtualPath) { + return HostingEnvironment.VirtualPathProvider.DirectoryExists(virtualPath); + } + + public void CreateDirectory(string virtualPath) { + Directory.CreateDirectory(MapPath(virtualPath)); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Environment/OrchardStarter.cs b/src/Orchard/Environment/OrchardStarter.cs index f8e6ec8f4..a86204858 100644 --- a/src/Orchard/Environment/OrchardStarter.cs +++ b/src/Orchard/Environment/OrchardStarter.cs @@ -15,6 +15,7 @@ using Orchard.Environment.State; using Orchard.Environment.Topology; using Orchard.Events; using Orchard.FileSystems.AppData; +using Orchard.FileSystems.Dependencies; using Orchard.FileSystems.WebSite; using Orchard.Logging; using Orchard.Services; @@ -30,10 +31,14 @@ namespace Orchard.Environment { // a single default host implementation is needed for bootstrapping a web app domain builder.RegisterType<DefaultOrchardEventBus>().As<IEventBus>().SingleInstance(); builder.RegisterType<DefaultCacheHolder>().As<ICacheHolder>().SingleInstance(); + builder.RegisterType<DefaultHostEnvironment>().As<IHostEnvironment>().SingleInstance(); + builder.RegisterType<DefaultBuildManager>().As<IBuildManager>().SingleInstance(); RegisterVolatileProvider<WebSiteFolder, IWebSiteFolder>(builder); RegisterVolatileProvider<AppDataFolder, IAppDataFolder>(builder); RegisterVolatileProvider<Clock, IClock>(builder); + RegisterVolatileProvider<DefaultDependenciesFolder, IDependenciesFolder>(builder); + RegisterVolatileProvider<DefaultVirtualPathProvider, IVirtualPathProvider>(builder); builder.RegisterType<DefaultOrchardHost>().As<IOrchardHost>().As<IEventHandler>().SingleInstance(); { @@ -63,6 +68,7 @@ namespace Orchard.Environment { builder.RegisterType<CoreExtensionLoader>().As<IExtensionLoader>().SingleInstance(); builder.RegisterType<ReferencedExtensionLoader>().As<IExtensionLoader>().SingleInstance(); builder.RegisterType<PrecompiledExtensionLoader>().As<IExtensionLoader>().SingleInstance(); + builder.RegisterType<ProbingExtensionLoader>().As<IExtensionLoader>().SingleInstance(); builder.RegisterType<DynamicExtensionLoader>().As<IExtensionLoader>().SingleInstance(); } } diff --git a/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs b/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs new file mode 100644 index 000000000..1020c0ee4 --- /dev/null +++ b/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs @@ -0,0 +1,110 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Xml.Linq; +using Orchard.Caching; +using Orchard.Environment; + +namespace Orchard.FileSystems.Dependencies { + public interface IDependenciesFolder : IVolatileProvider { + void StoreAssemblyFile(string assemblyName, string assemblyFileName); + Assembly LoadAssembly(string assemblyName); + } + + public class DefaultDependenciesFolder : IDependenciesFolder { + private const string _basePath = "~/App_Data/Dependencies"; + private readonly IVirtualPathProvider _virtualPathProvider; + + public DefaultDependenciesFolder(IVirtualPathProvider virtualPathProvider) { + _virtualPathProvider = virtualPathProvider; + } + + private string BasePath { + get { + return _basePath; + } + } + + private string PersistencePath { + get { + return _virtualPathProvider.Combine(BasePath, "dependencies.xml"); + } + } + + public void StoreAssemblyFile(string assemblyName, string assemblyFileName) { + StoreAssemblyFile(assemblyName, assemblyFileName, Path.GetFileName(assemblyFileName)); + } + + private void StoreAssemblyFile(string assemblyName, string assemblyFileName, string destinationFileName) { + _virtualPathProvider.CreateDirectory(BasePath); + + var destinationPath = _virtualPathProvider.MapPath(_virtualPathProvider.Combine(BasePath, destinationFileName)); + File.Copy(assemblyFileName, destinationPath); + + StoreDepencyInformation(assemblyName, destinationFileName); + } + + private void StoreDepencyInformation(string name, string fileName) { + var dependencies = ReadDependencies().ToList(); + + var dependency = dependencies.SingleOrDefault(d => d.Name == name); + if (dependency == null) { + dependency = new DependencyDescritpor { Name = name, FileName = fileName }; + dependencies.Add(dependency); + } + dependency.FileName = fileName; + + WriteDependencies(dependencies); + } + + public Assembly LoadAssembly(string assemblyName) { + _virtualPathProvider.CreateDirectory(BasePath); + + var dependency = ReadDependencies().SingleOrDefault(d => d.Name == assemblyName); + if (dependency == null) + return null; + + if (!_virtualPathProvider.FileExists(_virtualPathProvider.Combine(BasePath, dependency.FileName))) + return null; + + return Assembly.Load(Path.GetFileNameWithoutExtension(dependency.FileName)); + } + + private class DependencyDescritpor { + public string Name { get; set; } + public string FileName { get; set; } + } + + private IEnumerable<DependencyDescritpor> ReadDependencies() { + if (!_virtualPathProvider.FileExists(PersistencePath)) + return Enumerable.Empty<DependencyDescritpor>(); + + using (var stream = _virtualPathProvider.OpenFile(PersistencePath)) { + XDocument document = XDocument.Load(stream); + return document + .Elements(ns("Dependencies")) + .Elements(ns("Dependency")) + .Select(e => new DependencyDescritpor { Name = e.Element("Name").Value, FileName = e.Element("FileName").Value }) + .ToList(); + } + } + + private void WriteDependencies(IEnumerable<DependencyDescritpor> dependencies) { + var document = new XDocument(); + document.Add(new XElement(ns("Dependencies"))); + var elements = dependencies.Select(d => new XElement("Dependency", + new XElement(ns("Name"), d.Name), + new XElement(ns("FileName"), d.FileName))); + document.Root.Add(elements); + + using (var stream = _virtualPathProvider.CreateText(PersistencePath)) { + document.Save(stream, SaveOptions.None); + } + } + + private static XName ns(string name) { + return XName.Get(name/*, "http://schemas.microsoft.com/developer/msbuild/2003"*/); + } + } +} diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 1712e764a..69112e90b 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -136,14 +136,17 @@ <Compile Include="Data\DataModule.cs" /> <Compile Include="Data\Orderable.cs" /> <Compile Include="Environment\DefaultOrchardShell.cs" /> - <Compile Include="Environment\Extensions\Loaders\CSharpExtensionBuildProvider.cs" /> - <Compile Include="Environment\Extensions\Loaders\CSharpExtensionCompiler.cs" /> - <Compile Include="Environment\Extensions\Loaders\CSharpProjectExtensionCompilerMediumTrust.cs" /> - <Compile Include="Environment\Extensions\Loaders\CSharpProjectFullTrustCompiler.cs" /> - <Compile Include="Environment\Extensions\Loaders\CSharpProjectParser.cs" /> - <Compile Include="Environment\Extensions\Loaders\IAssemblyBuilder.cs" /> - <Compile Include="Environment\Extensions\Loaders\IBuildManager.cs" /> - <Compile Include="Environment\Extensions\Loaders\IVirtualPathProvider.cs" /> + <Compile Include="Environment\IHostEnvironment.cs" /> + <Compile Include="FileSystems\Dependencies\IDependenciesFolder.cs" /> + <Compile Include="Environment\Extensions\Loaders\ProbingExtensionLoader.cs" /> + <Compile Include="Environment\Extensions\Compilers\CSharpExtensionBuildProvider.cs" /> + <Compile Include="Environment\Extensions\Compilers\CSharpExtensionCompiler.cs" /> + <Compile Include="Environment\Extensions\Compilers\CSharpProjectMediumTrustCompiler.cs" /> + <Compile Include="Environment\Extensions\Compilers\CSharpProjectFullTrustCompiler.cs" /> + <Compile Include="Environment\Extensions\Compilers\CSharpProjectParser.cs" /> + <Compile Include="Environment\IAssemblyBuilder.cs" /> + <Compile Include="Environment\IBuildManager.cs" /> + <Compile Include="Environment\IVirtualPathProvider.cs" /> <Compile Include="Environment\IOrchardShell.cs" /> <Compile Include="Environment\OrchardStarter.cs" /> <Compile Include="Environment\State\DefaultProcessingEngine.cs" /> From 7ea379596db202b51f60fa413fbacbba1f675d9f Mon Sep 17 00:00:00 2001 From: Renaud Paquay <rpaquay@microsoft.com> Date: Fri, 4 Jun 2010 19:23:52 -0700 Subject: [PATCH 33/66] Fix error from previous merge --HG-- branch : dev --- src/Orchard/Localization/LocalizedString.cs | 4 ++++ src/Orchard/UI/Navigation/NavigationBuilder.cs | 17 +++++++---------- .../UI/Navigation/NavigationItemBuilder.cs | 6 ++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/Orchard/Localization/LocalizedString.cs b/src/Orchard/Localization/LocalizedString.cs index bd5f94b1f..8197f4219 100644 --- a/src/Orchard/Localization/LocalizedString.cs +++ b/src/Orchard/Localization/LocalizedString.cs @@ -12,6 +12,10 @@ namespace Orchard.Localization { return new LocalizedString(x); } + public string Text { + get { return _localized; } + } + public override string ToString() { return _localized; } diff --git a/src/Orchard/UI/Navigation/NavigationBuilder.cs b/src/Orchard/UI/Navigation/NavigationBuilder.cs index 5848557b4..8fbb45108 100644 --- a/src/Orchard/UI/Navigation/NavigationBuilder.cs +++ b/src/Orchard/UI/Navigation/NavigationBuilder.cs @@ -1,35 +1,32 @@ using System; using System.Collections.Generic; using System.Linq; +using Orchard.Localization; namespace Orchard.UI.Navigation { public class NavigationBuilder { IEnumerable<MenuItem> Contained { get; set; } - public NavigationBuilder Add(string caption, string position, Action<NavigationItemBuilder> itemBuilder) { + public NavigationBuilder Add(LocalizedString caption, string position, Action<NavigationItemBuilder> itemBuilder) { var childBuilder = new NavigationItemBuilder(); - if (!string.IsNullOrEmpty(caption)) - childBuilder.Caption(caption); - - if (!string.IsNullOrEmpty(position)) - childBuilder.Position(position); - + childBuilder.Caption(caption); + childBuilder.Position(position); itemBuilder(childBuilder); Contained = (Contained ?? Enumerable.Empty<MenuItem>()).Concat(childBuilder.Build()); return this; } - public NavigationBuilder Add(string caption, Action<NavigationItemBuilder> itemBuilder) { + public NavigationBuilder Add(LocalizedString caption, Action<NavigationItemBuilder> itemBuilder) { return Add(caption, null, itemBuilder); } public NavigationBuilder Add(Action<NavigationItemBuilder> itemBuilder) { return Add(null, null, itemBuilder); } - public NavigationBuilder Add(string caption, string position) { + public NavigationBuilder Add(LocalizedString caption, string position) { return Add(caption, position, x=> { }); } - public NavigationBuilder Add(string caption) { + public NavigationBuilder Add(LocalizedString caption) { return Add(caption, null, x => { }); } diff --git a/src/Orchard/UI/Navigation/NavigationItemBuilder.cs b/src/Orchard/UI/Navigation/NavigationItemBuilder.cs index 52a0c9246..61bc5da3a 100644 --- a/src/Orchard/UI/Navigation/NavigationItemBuilder.cs +++ b/src/Orchard/UI/Navigation/NavigationItemBuilder.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.Routing; +using Orchard.Localization; using Orchard.Security.Permissions; namespace Orchard.UI.Navigation { @@ -11,8 +12,9 @@ namespace Orchard.UI.Navigation { _item = new MenuItem(); } - public NavigationItemBuilder Caption(string caption) { - _item.Text = caption; + public NavigationItemBuilder Caption(LocalizedString caption) { + if (caption != null) + _item.Text = caption.Text; return this; } From a249579191e182492a88e3ac2b6e5180ee4e94a1 Mon Sep 17 00:00:00 2001 From: Renaud Paquay <rpaquay@microsoft.com> Date: Fri, 4 Jun 2010 19:58:23 -0700 Subject: [PATCH 34/66] Fix localization issue from previous merge --HG-- branch : dev --- src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx | 2 +- src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index e0f8681ba..cbd81167d 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Search.ViewModels.SearchViewModel>" %> <%@ Import Namespace="Orchard.Mvc.Html" %><% Html.RegisterStyle("search.css"); %> -<h1><%=Html.TitleForPage(T("Search"))%></h1><% +<h1><%=Html.TitleForPage(T("Search").Text)%></h1><% Html.Zone("search"); if (!string.IsNullOrWhiteSpace(Model.Query)) { %> <p class="search-summary"><%=T("<em>{0}</em> results", Model.Results.Count()) %></p><% diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx index c6813f5cc..c147703c9 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<LogOnViewModel>" %> <%@ Import Namespace="Orchard.Users.ViewModels"%> <h1><%=Html.TitleForPage(Model.Title)%></h1> -<p><%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink(T("Register"), "Register")%><%=_Encoded(" if you don't have an account.")%></p> +<p><%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink(T("Register").Text, "Register")%><%=_Encoded(" if you don't have an account.")%></p> <%= Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())%> <% using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Request.QueryString["ReturnUrl"]}))) { %> From 412d21b23437e91b36c5b8a6a055f4aac91f0c43 Mon Sep 17 00:00:00 2001 From: Renaud Paquay <rpaquay@microsoft.com> Date: Fri, 4 Jun 2010 19:59:20 -0700 Subject: [PATCH 35/66] Tweak extension loading strategy: Don't store compiled assemblies in "App_Data/Dependencies" if we have a more recent one already stored. --HG-- branch : dev --- .../Loaders/PrecompiledExtensionLoader.cs | 2 +- .../Loaders/ProbingExtensionLoader.cs | 2 +- .../Dependencies/IDependenciesFolder.cs | 28 ++++++++++++++----- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs index 5d24d8205..8e65e2183 100644 --- a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs @@ -15,7 +15,7 @@ namespace Orchard.Environment.Extensions.Loaders { _virtualPathProvider = virtualPathProvider; } - public int Order { get { return 40; } } + public int Order { get { return 30; } } public ExtensionEntry Load(ExtensionDescriptor descriptor) { var extensionPath = _virtualPathProvider.Combine(descriptor.Location, descriptor.Name, "bin", diff --git a/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs index 12b40c516..6f83506a2 100644 --- a/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs @@ -13,7 +13,7 @@ namespace Orchard.Environment.Extensions.Loaders { _folder = folder; } - public int Order { get { return 30; } } + public int Order { get { return 40; } } public ExtensionEntry Load(ExtensionDescriptor descriptor) { var assembly = _folder.LoadAssembly(descriptor.Name); diff --git a/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs b/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs index 1020c0ee4..64ffa7578 100644 --- a/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs +++ b/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs @@ -33,16 +33,30 @@ namespace Orchard.FileSystems.Dependencies { } public void StoreAssemblyFile(string assemblyName, string assemblyFileName) { - StoreAssemblyFile(assemblyName, assemblyFileName, Path.GetFileName(assemblyFileName)); - } - - private void StoreAssemblyFile(string assemblyName, string assemblyFileName, string destinationFileName) { _virtualPathProvider.CreateDirectory(BasePath); - var destinationPath = _virtualPathProvider.MapPath(_virtualPathProvider.Combine(BasePath, destinationFileName)); - File.Copy(assemblyFileName, destinationPath); + // Only store assembly if it's more recent that what we have stored already (if anything) + if (IsNewerAssembly(assemblyName, assemblyFileName)) { + var destinationFileName = Path.GetFileName(assemblyFileName); + var destinationPath = _virtualPathProvider.MapPath(_virtualPathProvider.Combine(BasePath, destinationFileName)); + File.Copy(assemblyFileName, destinationPath); - StoreDepencyInformation(assemblyName, destinationFileName); + StoreDepencyInformation(assemblyName, destinationFileName); + } + } + + private bool IsNewerAssembly(string assemblyName, string assemblyFileName) { + var dependency = ReadDependencies().SingleOrDefault(d => d.Name == assemblyName); + if (dependency == null) { + return true; + } + + var existingFileName = _virtualPathProvider.MapPath(_virtualPathProvider.Combine(BasePath, dependency.FileName)); + if (!File.Exists(existingFileName)) { + return true; + } + + return (File.GetCreationTimeUtc(existingFileName) <= File.GetCreationTimeUtc(assemblyFileName)); } private void StoreDepencyInformation(string name, string fileName) { From 40f7b8bd8c29dd89e20f00169c2f9bc302e3bad8 Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Sat, 5 Jun 2010 01:26:14 -0700 Subject: [PATCH 36/66] Adding paging to search --HG-- branch : dev --- .../Controllers/SearchController.cs | 26 ++++++-- .../ViewModels/SearchViewModel.cs | 6 +- .../Orchard.Search/Views/Search/Index.ascx | 7 ++- src/Orchard/Mvc/Html/HtmlHelperExtensions.cs | 60 +++++++++++++++++++ 4 files changed, 89 insertions(+), 10 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs index 8e4e4e45a..8ad738db8 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -14,14 +14,28 @@ namespace Orchard.Search.Controllers { _contentManager = contentManager; } - public ActionResult Index(string q) { - var searchViewModel = new SearchViewModel {Query = q}; + public ActionResult Index(string q, int page = 0, int pageSize = 0) { + var take = pageSize > 0 ? pageSize : 10; + var skip = (page > 0 ? page - 1 : 0) * take; + var searchViewModel = new SearchViewModel { + Query = q, + Page = page > 0 ? page : 1, + PageSize = take + }; var results = _searchService.Query(q); - searchViewModel.Results = results.Select(result => new SearchResultViewModel { - Content = _contentManager.BuildDisplayModel(_contentManager.Get(result.Id), "SummaryForSearch"), - SearchHit = result - }).ToList(); + + searchViewModel.Count = results.Count(); + searchViewModel.TotalPageCount = searchViewModel.Count/searchViewModel.PageSize; + //todo: deal with page requests beyond result count + searchViewModel.ResultsPage = results + .Select(result => new SearchResultViewModel { + Content = _contentManager.BuildDisplayModel(_contentManager.Get(result.Id), "SummaryForSearch"), + SearchHit = result + }) + .Skip(skip) + .Take(take) + .ToList(); return View(searchViewModel); } diff --git a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs index 0ccfa956e..95fe09102 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs @@ -3,7 +3,11 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Search.ViewModels { public class SearchViewModel : BaseViewModel { - public IEnumerable<SearchResultViewModel> Results { get; set; } + public IEnumerable<SearchResultViewModel> ResultsPage { get; set; } + public int Count { get; set; } + public int Page { get; set; } + public int PageSize { get; set; } + public int TotalPageCount { get; set; } public string Query { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index cbd81167d..292853320 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -4,8 +4,9 @@ Html.RegisterStyle("search.css"); %> <h1><%=Html.TitleForPage(T("Search").Text)%></h1><% Html.Zone("search"); if (!string.IsNullOrWhiteSpace(Model.Query)) { %> -<p class="search-summary"><%=T("<em>{0}</em> results", Model.Results.Count()) %></p><% +<p class="search-summary"><%=T("<em>{0} - {1}</em> of <em>{2}</em> results", (Model.Page - 1) * Model.PageSize + 1, Model.Page * Model.PageSize > Model.Count ? Model.Count : Model.Page * Model.PageSize, Model.Count)%></p><% } -if (Model.Results.Count() > 0) { %> -<%=Html.UnorderedList(Model.Results, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString(), "search-results contentItems") %><% +if (Model.ResultsPage.Count() > 0) { %> +<%=Html.UnorderedList(Model.ResultsPage, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString(), "search-results contentItems") %> +<%=Html.Pager(Model.TotalPageCount, Model.Page, new {q = Model.Query}, "<", ">", false) %><% } %> \ No newline at end of file diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs index aabadcfb4..36b4bd374 100644 --- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs +++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs @@ -40,6 +40,66 @@ namespace Orchard.Mvc.Html { return MvcHtmlString.Create(builder.ToString(TagRenderMode.Normal)); } + #region Pager + + public static string Pager(this HtmlHelper html, int pageCount, int currentPage, object values, string previousText, string nextText, bool alwaysShowPreviousAndNext) { + if (pageCount < 2) + return ""; + + var sb = new StringBuilder(75); + var viewContext = html.ViewContext; + var rvd = new RouteValueDictionary(); + + foreach (var item in viewContext.RouteData.Values) { + rvd.Add(item.Key, item.Value); + } + + var urlHelper = new UrlHelper(viewContext.RequestContext); + + if (values != null) { + var rvd2 = new RouteValueDictionary(values); + + foreach (var item in rvd2) { + rvd[item.Key] = item.Value; + } + } + + sb.Append("<p class=\"pager\">"); + + if (currentPage > 1 || alwaysShowPreviousAndNext) { + if (currentPage == 2) + rvd.Remove("page"); + else + rvd["page"] = currentPage - 1; + + sb.AppendFormat(" <a href=\"{1}\" class=\"previous\">{0}</a>", previousText, + urlHelper.RouteUrl(rvd)); + } + + //todo: when there are many pages (> 15?) maybe do something like 1 2 3...6 7 8...13 14 15 + for (var p = 1; p <= pageCount; p++) { + if (p == currentPage) { + sb.AppendFormat(" <span>{0}</span>", p); + } + else { + rvd["page"] = p; + sb.AppendFormat(" <a href=\"{1}\">{0}</a>", p, + urlHelper.RouteUrl(rvd)); + } + } + + if (currentPage < pageCount || alwaysShowPreviousAndNext) { + rvd["page"] = currentPage + 1; + sb.AppendFormat("<a href=\"{1}\" class=\"next\">{0}</a>", nextText, + urlHelper.RouteUrl(rvd)); + } + + sb.Append("</p>"); + + return sb.ToString(); + } + + #endregion #region UnorderedList From 182801d1fa2c89df924a0d09b5639cc66101bf68 Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Sat, 5 Jun 2010 01:32:48 -0700 Subject: [PATCH 37/66] Fixing the search pager to not lose the last page --HG-- branch : dev --- .../Modules/Orchard.Search/Controllers/SearchController.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs index 8ad738db8..426d72ac9 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using System.Web.Mvc; using Orchard.ContentManagement; using Orchard.Search.Services; @@ -26,7 +27,7 @@ namespace Orchard.Search.Controllers { var results = _searchService.Query(q); searchViewModel.Count = results.Count(); - searchViewModel.TotalPageCount = searchViewModel.Count/searchViewModel.PageSize; + searchViewModel.TotalPageCount = (int)Math.Round((decimal)searchViewModel.Count/searchViewModel.PageSize); //todo: deal with page requests beyond result count searchViewModel.ResultsPage = results .Select(result => new SearchResultViewModel { From e8c8d5493e6849f8da8ee2e19b7f6c8fbd9034e7 Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Sat, 5 Jun 2010 01:40:15 -0700 Subject: [PATCH 38/66] Updated the message for when there are no results for a search query --HG-- branch : dev --- .../Modules/Orchard.Search/Views/Search/Index.ascx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index 292853320..aa3f70bd4 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -3,7 +3,10 @@ Html.RegisterStyle("search.css"); %> <h1><%=Html.TitleForPage(T("Search").Text)%></h1><% Html.Zone("search"); -if (!string.IsNullOrWhiteSpace(Model.Query)) { %> +if (Model.Count == 0) { %> +<p class="search-summary"><%=T("<em>zero</em> results")%></p><% +} +else if (!string.IsNullOrWhiteSpace(Model.Query)) { %> <p class="search-summary"><%=T("<em>{0} - {1}</em> of <em>{2}</em> results", (Model.Page - 1) * Model.PageSize + 1, Model.Page * Model.PageSize > Model.Count ? Model.Count : Model.Page * Model.PageSize, Model.Count)%></p><% } if (Model.ResultsPage.Count() > 0) { %> From 3c0fa2268f561f836ed25eb29a939143a2c9052c Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Sat, 5 Jun 2010 01:44:16 -0700 Subject: [PATCH 39/66] Really fixing the search pager to note lose the last page --HG-- branch : dev --- .../Modules/Orchard.Search/Controllers/SearchController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs index 426d72ac9..a62984f27 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -27,7 +27,7 @@ namespace Orchard.Search.Controllers { var results = _searchService.Query(q); searchViewModel.Count = results.Count(); - searchViewModel.TotalPageCount = (int)Math.Round((decimal)searchViewModel.Count/searchViewModel.PageSize); + searchViewModel.TotalPageCount = (int)Math.Ceiling((decimal)searchViewModel.Count/searchViewModel.PageSize); //todo: deal with page requests beyond result count searchViewModel.ResultsPage = results .Select(result => new SearchResultViewModel { From faf696effe04d212b7c4fb8499b0303ac5c52e8d Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Sat, 5 Jun 2010 14:44:11 -0700 Subject: [PATCH 40/66] Pulling search result page selection back into the service and cleaning up a few other bits --HG-- branch : dev --- .../Controllers/SearchController.cs | 11 +++--- .../Orchard.Search/Models/ISearchResult.cs | 9 +++++ .../Orchard.Search/Models/SearchResult.cs | 9 +++++ .../Orchard.Search/Orchard.Search.csproj | 2 + .../Orchard.Search/Services/ISearchService.cs | 5 +-- .../Orchard.Search/Services/SearchService.cs | 39 +++++++++++-------- .../Orchard.Search/Views/Search/Index.ascx | 16 ++++---- src/Orchard/Mvc/Html/HtmlHelperExtensions.cs | 2 +- 8 files changed, 61 insertions(+), 32 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Models/ISearchResult.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Models/SearchResult.cs diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs index a62984f27..fb0fca24a 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -24,18 +24,19 @@ namespace Orchard.Search.Controllers { PageSize = take }; - var results = _searchService.Query(q); + var results = _searchService.Query(q, skip, take); - searchViewModel.Count = results.Count(); + if (results == null) + return View(searchViewModel); + + searchViewModel.Count = results.TotalCount; searchViewModel.TotalPageCount = (int)Math.Ceiling((decimal)searchViewModel.Count/searchViewModel.PageSize); //todo: deal with page requests beyond result count - searchViewModel.ResultsPage = results + searchViewModel.ResultsPage = results.Page .Select(result => new SearchResultViewModel { Content = _contentManager.BuildDisplayModel(_contentManager.Get(result.Id), "SummaryForSearch"), SearchHit = result }) - .Skip(skip) - .Take(take) .ToList(); return View(searchViewModel); diff --git a/src/Orchard.Web/Modules/Orchard.Search/Models/ISearchResult.cs b/src/Orchard.Web/Modules/Orchard.Search/Models/ISearchResult.cs new file mode 100644 index 000000000..73ecec10e --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Models/ISearchResult.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; +using Orchard.Indexing; + +namespace Orchard.Search.Models { + public interface ISearchResult { + IEnumerable<ISearchHit> Page { get; set; } + int TotalCount { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchResult.cs b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchResult.cs new file mode 100644 index 000000000..77f86c7c3 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchResult.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; +using Orchard.Indexing; + +namespace Orchard.Search.Models { + public class SearchResult : ISearchResult { + public IEnumerable<ISearchHit> Page { get; set; } + public int TotalCount { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj index 5ee797d6f..bd2162dbb 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -71,7 +71,9 @@ <Compile Include="Filters\SearchFilter.cs" /> <Compile Include="Permissions.cs" /> <Compile Include="Routes.cs" /> + <Compile Include="Models\ISearchResult.cs" /> <Compile Include="Services\ISearchService.cs" /> + <Compile Include="Models\SearchResult.cs" /> <Compile Include="Services\SearchService.cs" /> <Compile Include="ViewModels\SearchIndexViewModel.cs" /> <Compile Include="ViewModels\SearchResultViewModel.cs" /> diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs index 5f23fb778..38e1b332f 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs @@ -1,11 +1,10 @@ using System; -using System.Collections.Generic; -using Orchard.Indexing; +using Orchard.Search.Models; namespace Orchard.Search.Services { public interface ISearchService : IDependency { bool HasIndexToManage { get; } - IEnumerable<ISearchHit> Query(string term); + ISearchResult Query(string query, int skip, int? take); void RebuildIndex(); void UpdateIndex(); DateTime GetIndexUpdatedUtc(); diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs index 52454fb72..f10297398 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; using Orchard.Indexing; using Orchard.Localization; +using Orchard.Search.Models; using Orchard.UI.Notify; namespace Orchard.Search.Services @@ -27,17 +27,26 @@ namespace Orchard.Search.Services get { return _indexManager.HasIndexProvider(); } } - public IEnumerable<ISearchHit> Query(string term) { - if (string.IsNullOrWhiteSpace(term) || !_indexManager.HasIndexProvider()) - return Enumerable.Empty<ISearchHit>(); + ISearchResult ISearchService.Query(string query, int skip, int? take) { + if (string.IsNullOrWhiteSpace(query) || !_indexManager.HasIndexProvider()) + return null; - return _indexManager.GetSearchIndexProvider().CreateSearchBuilder(SearchIndexName) - .WithField("title", term) - .WithField("body", term) - .Search(); + var searchBuilder = _indexManager.GetSearchIndexProvider().CreateSearchBuilder(SearchIndexName) + .WithField("title", query) + .WithField("body", query); + + var totalCount = searchBuilder.Count(); + if (take != null) + searchBuilder = searchBuilder + .Slice(skip, (int)take); + + return new SearchResult { + Page = searchBuilder.Search(), + TotalCount = totalCount + }; } - public void RebuildIndex() { + void ISearchService.RebuildIndex() { if (!_indexManager.HasIndexProvider()) { Services.Notifier.Warning(T("There is no search index to rebuild.")); return; @@ -51,7 +60,7 @@ namespace Orchard.Search.Services Services.Notifier.Information(T("The search index has been rebuilt.")); } - public void UpdateIndex() { + void ISearchService.UpdateIndex() { foreach(var handler in _indexNotifierHandlers) { handler.UpdateIndex(SearchIndexName); @@ -60,12 +69,10 @@ namespace Orchard.Search.Services Services.Notifier.Information(T("The search index has been updated.")); } - public DateTime GetIndexUpdatedUtc() { - if(!HasIndexToManage) { - return DateTime.MinValue; - } - - return _indexManager.GetSearchIndexProvider().GetLastIndexUtc(SearchIndexName); + DateTime ISearchService.GetIndexUpdatedUtc() { + return !HasIndexToManage + ? DateTime.MinValue + : _indexManager.GetSearchIndexProvider().GetLastIndexUtc(SearchIndexName); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index aa3f70bd4..7705343c5 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -3,13 +3,15 @@ Html.RegisterStyle("search.css"); %> <h1><%=Html.TitleForPage(T("Search").Text)%></h1><% Html.Zone("search"); -if (Model.Count == 0) { %> -<p class="search-summary"><%=T("<em>zero</em> results")%></p><% +if (!string.IsNullOrWhiteSpace(Model.Query)) { + if (Model.Count == 0) { %> + <p class="search-summary"><%=T("<em>zero</em> results") %></p><% + } + else { %> + <p class="search-summary"><%=T("<em>{0} - {1}</em> of <em>{2}</em> results", (Model.Page - 1) * Model.PageSize + 1, Model.Page * Model.PageSize > Model.Count ? Model.Count : Model.Page * Model.PageSize, Model.Count)%></p><% + } } -else if (!string.IsNullOrWhiteSpace(Model.Query)) { %> -<p class="search-summary"><%=T("<em>{0} - {1}</em> of <em>{2}</em> results", (Model.Page - 1) * Model.PageSize + 1, Model.Page * Model.PageSize > Model.Count ? Model.Count : Model.Page * Model.PageSize, Model.Count)%></p><% -} -if (Model.ResultsPage.Count() > 0) { %> +if (Model.ResultsPage != null && Model.ResultsPage.Count() > 0) { %> <%=Html.UnorderedList(Model.ResultsPage, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString(), "search-results contentItems") %> -<%=Html.Pager(Model.TotalPageCount, Model.Page, new {q = Model.Query}, "<", ">", false) %><% +<%=Html.Pager(Model.TotalPageCount, Model.Page, new {q = Model.Query}) %><% } %> \ No newline at end of file diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs index 36b4bd374..5610daebe 100644 --- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs +++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs @@ -42,7 +42,7 @@ namespace Orchard.Mvc.Html { } #region Pager - public static string Pager(this HtmlHelper html, int pageCount, int currentPage, object values, string previousText, string nextText, bool alwaysShowPreviousAndNext) { + public static string Pager(this HtmlHelper html, int pageCount, int currentPage, object values = null, string previousText = "<", string nextText = ">", bool alwaysShowPreviousAndNext = false) { if (pageCount < 2) return ""; From b63e5f2bcd879f98011597c0fa31e12d57182df8 Mon Sep 17 00:00:00 2001 From: Louis DeJardin <Louis.DeJardin@microsoft.com> Date: Sun, 6 Jun 2010 14:58:27 -0700 Subject: [PATCH 41/66] Working towards definition import/export Reader and writer mapping definition to infoset Devtools placeholder providing way to see/alter metadata Reader on builder over existing content definition provides merge capabilies on import --HG-- branch : dev --- .../Services/ContentDefinitionReaderTests.cs | 52 +++++++++++++++ .../Services/ContentDefinitionWriterTests.cs | 55 ++++++++++++++++ .../Orchard.Framework.Tests.csproj | 2 + .../Controllers/MetadataController.cs | 65 +++++++++++++++++++ .../Orchard.DevTools/Orchard.DevTools.csproj | 3 + .../ViewModels/MetadataIndexViewModel.cs | 11 ++++ .../Orchard.DevTools/Views/Home/Index.aspx | 1 + .../Views/Metadata/Index.aspx | 44 +++++++++++++ .../Orchard.MultiTenancy.csproj | 1 + .../Controllers/AdminController.cs | 1 + .../MetaData/IContentDefinitionReader.cs | 17 +++++ .../MetaData/IContentDefinitionWriter.cs | 9 +++ .../Services/ContentDefinitionReader.cs | 32 +++++++++ .../Services/ContentDefinitionWriter.cs | 42 ++++++++++++ .../MetaData/Services/SettingsFormatter.cs | 5 +- src/Orchard/Orchard.Framework.csproj | 4 ++ 16 files changed, 342 insertions(+), 2 deletions(-) create mode 100644 src/Orchard.Tests/ContentManagement/MetaData/Services/ContentDefinitionReaderTests.cs create mode 100644 src/Orchard.Tests/ContentManagement/MetaData/Services/ContentDefinitionWriterTests.cs create mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/Controllers/MetadataController.cs create mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/MetadataIndexViewModel.cs create mode 100644 src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx create mode 100644 src/Orchard/ContentManagement/MetaData/IContentDefinitionReader.cs create mode 100644 src/Orchard/ContentManagement/MetaData/IContentDefinitionWriter.cs create mode 100644 src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionReader.cs create mode 100644 src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionWriter.cs diff --git a/src/Orchard.Tests/ContentManagement/MetaData/Services/ContentDefinitionReaderTests.cs b/src/Orchard.Tests/ContentManagement/MetaData/Services/ContentDefinitionReaderTests.cs new file mode 100644 index 000000000..07a363a4d --- /dev/null +++ b/src/Orchard.Tests/ContentManagement/MetaData/Services/ContentDefinitionReaderTests.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Xml.Linq; +using NUnit.Framework; +using Orchard.ContentManagement.MetaData; +using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Services; + +namespace Orchard.Tests.ContentManagement.MetaData.Services { + [TestFixture] + public class ContentDefinitionReaderTests { + private IContentDefinitionReader _reader; + + [SetUp] + public void Init() { + _reader = new ContentDefinitionReader(new SettingsFormatter()); + } + + [Test] + public void ReadingElementSetsName() { + var builder = new ContentTypeDefinitionBuilder(); + _reader.Merge(new XElement("foo"), builder); + var type = builder.Build(); + Assert.That(type.Name, Is.EqualTo("foo")); + } + + + [Test] + public void AttributesAreAppliedAsSettings() { + var builder = new ContentTypeDefinitionBuilder(); + _reader.Merge(new XElement("foo", new XAttribute("x", "1")), builder); + var type = builder.Build(); + Assert.That(type.Settings["x"], Is.EqualTo("1")); + } + + [Test] + public void ChildElementsAreAddedAsPartsWithSettings() { + var builder = new ContentTypeDefinitionBuilder(); + _reader.Merge(new XElement("foo", new XElement("bar", new XAttribute("y", "2"))), builder); + var type = builder.Build(); + Assert.That(type.Parts.Single().PartDefinition.Name, Is.EqualTo("bar")); + Assert.That(type.Parts.Single().Settings["y"], Is.EqualTo("2")); + } + + [Test, Ignore("Parts can be removed by name")] + public void PartsCanBeRemovedByNameWhenImporting() { + Assert.Fail(); + } + } +} diff --git a/src/Orchard.Tests/ContentManagement/MetaData/Services/ContentDefinitionWriterTests.cs b/src/Orchard.Tests/ContentManagement/MetaData/Services/ContentDefinitionWriterTests.cs new file mode 100644 index 000000000..6182f7b25 --- /dev/null +++ b/src/Orchard.Tests/ContentManagement/MetaData/Services/ContentDefinitionWriterTests.cs @@ -0,0 +1,55 @@ +using System.Linq; +using System.Xml; +using System.Xml.Linq; +using NUnit.Framework; +using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Services; + +namespace Orchard.Tests.ContentManagement.MetaData.Services { + [TestFixture] + public class ContentDefinitionWriterTests { + private ContentDefinitionWriter _writer; + + [SetUp] + public void Init() { + _writer = new ContentDefinitionWriter(new SettingsFormatter()); + } + + [Test] + public void CreatesElementWithEncodedContentTypeName() { + var alphaInfoset = _writer.Export(new ContentTypeDefinitionBuilder().Named("alpha").Build()); + var betaInfoset = _writer.Export(new ContentTypeDefinitionBuilder().Named(":beta").Build()); + var gammaInfoset = _writer.Export(new ContentTypeDefinitionBuilder().Named(" g a m m a ").Build()); + var deltaInfoset = _writer.Export(new ContentTypeDefinitionBuilder().Named("del\r\nta").Build()); + + Assert.That(XmlConvert.DecodeName(alphaInfoset.Name.LocalName), Is.EqualTo("alpha")); + Assert.That(XmlConvert.DecodeName(betaInfoset.Name.LocalName), Is.EqualTo(":beta")); + Assert.That(XmlConvert.DecodeName(gammaInfoset.Name.LocalName), Is.EqualTo(" g a m m a ")); + Assert.That(XmlConvert.DecodeName(deltaInfoset.Name.LocalName), Is.EqualTo("del\r\nta")); + } + + [Test] + public void ChildElementsArePartNames() { + var alphaInfoset = _writer.Export(new ContentTypeDefinitionBuilder().Named("alpha").WithPart(":beta").WithPart("del\r\nta").Build()); + + Assert.That(XmlConvert.DecodeName(alphaInfoset.Name.LocalName), Is.EqualTo("alpha")); + Assert.That(alphaInfoset.Elements().Count(), Is.EqualTo(2)); + Assert.That(alphaInfoset.Elements().Select(elt => elt.Name.LocalName), Has.Some.EqualTo(XmlConvert.EncodeLocalName(":beta"))); + Assert.That(alphaInfoset.Elements().Select(elt => elt.Name.LocalName), Has.Some.EqualTo(XmlConvert.EncodeLocalName("del\r\nta"))); + } + + [Test] + public void TypeAndTypePartSettingsAreAttributes() { + + var alpha = new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithSetting("x", "1") + .WithPart("beta", part => part.WithSetting(" y ", "2")) + .Build(); + + var alphaInfoset = _writer.Export(alpha); + Assert.That(alphaInfoset.Attributes("x").Single().Value, Is.EqualTo("1")); + Assert.That(alphaInfoset.Elements("beta").Attributes(XmlConvert.EncodeLocalName(" y ")).Single().Value, Is.EqualTo("2")); + } + } +} diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 5d469d06c..4b9753276 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -154,6 +154,8 @@ <Compile Include="ContentManagement\Handlers\ContentHandlerTests.cs" /> <Compile Include="ContentManagement\Handlers\ModelBuilderTests.cs" /> <Compile Include="ContentManagement\MetaData\Builders\ContentTypeDefinitionBuilderTests.cs" /> + <Compile Include="ContentManagement\MetaData\Services\ContentDefinitionReaderTests.cs" /> + <Compile Include="ContentManagement\MetaData\Services\ContentDefinitionWriterTests.cs" /> <Compile Include="ContentManagement\Models\Alpha.cs" /> <Compile Include="ContentManagement\Models\AlphaHandler.cs" /> <Compile Include="ContentManagement\Models\Beta.cs" /> diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/MetadataController.cs b/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/MetadataController.cs new file mode 100644 index 000000000..bc3a60e86 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Controllers/MetadataController.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using System.Xml; +using System.Xml.Linq; +using Orchard.ContentManagement.MetaData; +using Orchard.DevTools.ViewModels; + +namespace Orchard.DevTools.Controllers { + [ValidateInput(false)] + public class MetadataController : Controller { + private readonly IContentDefinitionManager _contentDefinitionManager; + private readonly IContentDefinitionWriter _contentDefinitionWriter; + private readonly IContentDefinitionReader _contentDefinitionReader; + + public MetadataController( + IContentDefinitionManager contentDefinitionManager, + IContentDefinitionWriter contentDefinitionWriter, + IContentDefinitionReader contentDefinitionReader) { + _contentDefinitionManager = contentDefinitionManager; + _contentDefinitionWriter = contentDefinitionWriter; + _contentDefinitionReader = contentDefinitionReader; + } + + public ActionResult Index() { + var model = new MetadataIndexViewModel { + TypeDefinitions = _contentDefinitionManager.ListTypeDefinitions(), + PartDefinitions = _contentDefinitionManager.ListPartDefinitions() + }; + var types = new XElement("Types"); + foreach (var type in model.TypeDefinitions) { + types.Add(_contentDefinitionWriter.Export(type)); + } + + var parts = new XElement("Parts"); + foreach (var part in model.PartDefinitions) { + parts.Add(_contentDefinitionWriter.Export(part)); + } + + var stringWriter = new StringWriter(); + using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings { Indent = true, IndentChars = " " })) { + if (xmlWriter != null) { + new XElement("Orchard", types, parts).WriteTo(xmlWriter); + } + } + model.ExportText = stringWriter.ToString(); + + return View(model); + } + + [HttpPost] + public ActionResult Index(MetadataIndexViewModel model) { + var root = XElement.Parse(model.ExportText); + foreach (var element in root.Elements("Types").Elements()) { + var typeElement = element; + var typeName = XmlConvert.DecodeName(element.Name.LocalName); + _contentDefinitionManager.AlterTypeDefinition(typeName, alteration => _contentDefinitionReader.Merge(typeElement, alteration)); + } + return RedirectToAction("Index"); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj index b97bf93cd..fd88a2bd9 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj @@ -73,6 +73,7 @@ <Compile Include="Commands\ProfilingCommands.cs" /> <Compile Include="Controllers\ContentController.cs" /> <Compile Include="Controllers\HomeController.cs" /> + <Compile Include="Controllers\MetadataController.cs" /> <Compile Include="Handlers\DebugLinkHandler.cs" /> <Compile Include="Models\ShowDebugLink.cs" /> <Compile Include="Models\Simple.cs" /> @@ -80,6 +81,7 @@ <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="ViewModels\ContentIndexViewModel.cs" /> <Compile Include="ViewModels\ContentDetailsViewModel.cs" /> + <Compile Include="ViewModels\MetadataIndexViewModel.cs" /> </ItemGroup> <ItemGroup> <Content Include="Module.txt" /> @@ -90,6 +92,7 @@ <Content Include="Views\Home\Index.aspx" /> <Content Include="Views\DisplayTemplates\Parts\DevTools.ShowDebugLink.ascx" /> <Content Include="Views\EditorTemplates\Parts\DevTools.ShowDebugLink.ascx" /> + <Content Include="Views\Metadata\Index.aspx" /> <Content Include="Web.config" /> <Content Include="Views\Web.config" /> </ItemGroup> diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/MetadataIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/MetadataIndexViewModel.cs new file mode 100644 index 000000000..574430485 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.DevTools/ViewModels/MetadataIndexViewModel.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; +using Orchard.ContentManagement.MetaData.Models; +using Orchard.Mvc.ViewModels; + +namespace Orchard.DevTools.ViewModels { + public class MetadataIndexViewModel : BaseViewModel { + public IEnumerable<ContentTypeDefinition> TypeDefinitions { get; set; } + public IEnumerable<ContentPartDefinition> PartDefinitions { get; set; } + public string ExportText { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx index 741c0cb7a..dab5ed155 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx @@ -2,4 +2,5 @@ <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <h1><%=Html.TitleForPage(T("Dev Tools").ToString()) %></h1> <p><%=Html.ActionLink(T("Contents").ToString(), "Index", "Content") %></p> +<p><%=Html.ActionLink(T("Metadata").ToString(), "Index", "Metadata") %></p> <p><%=Html.ActionLink(T("Test Unauthorized Request").ToString(), "NotAuthorized", "Home")%></p> diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx new file mode 100644 index 000000000..7c119bf89 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx @@ -0,0 +1,44 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<MetadataIndexViewModel>" %> + +<%@ Import Namespace="Orchard.DevTools.ViewModels" %> +<style title="text/css"> + ul + { + margin-left: 12px; + } +</style> +<h1> + Metadata</h1> +<h2> + Content Type Definitions</h2> +<ul> + <%foreach (var type in Model.TypeDefinitions) {%> + <li> + <%:type.Name %> + <ul> + <%foreach (var part in type.Parts) {%> + <li> + <%:part.PartDefinition.Name %></li> + <% + }%> + </ul> + </li> + <% + }%> +</ul> +<h2> + Content Part Definitions</h2> +<ul> + <%foreach (var part in Model.PartDefinitions) {%> + <li> + <%:part.Name %></li> + <% + }%> +</ul> +<h2> +Exported as xml</h2> +<% using (Html.BeginFormAntiForgeryPost()) { %> +<%:Html.TextAreaFor(m=>m.ExportText, new{style="width:100%;height:640px;"}) %> +<br /> +<input class="button primaryAction" type="submit" value="<%=_Encoded("Merge Changes") %>" /> +<%} %> diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj index 6ab56cf17..9e3facaa7 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -96,6 +96,7 @@ <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj"> <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project> <Name>Orchard.Framework</Name> + <Private>False</Private> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs index e85de7d77..5578531ab 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs @@ -10,6 +10,7 @@ using Orchard.Users.Services; using Orchard.Users.ViewModels; namespace Orchard.Users.Controllers { + [ValidateInput(false)] public class AdminController : Controller, IUpdateModel { private readonly IMembershipService _membershipService; private readonly IUserService _userService; diff --git a/src/Orchard/ContentManagement/MetaData/IContentDefinitionReader.cs b/src/Orchard/ContentManagement/MetaData/IContentDefinitionReader.cs new file mode 100644 index 000000000..c24691de3 --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/IContentDefinitionReader.cs @@ -0,0 +1,17 @@ +using System.Xml.Linq; +using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Models; + +namespace Orchard.ContentManagement.MetaData { + public interface IContentDefinitionReader : IDependency { + void Merge(XElement source, ContentTypeDefinitionBuilder builder); + } + + public static class ContentDefinitionReaderExtensions { + public static ContentTypeDefinition Import(this IContentDefinitionReader reader, XElement source) { + var target = new ContentTypeDefinitionBuilder(); + reader.Merge(source, target); + return target.Build(); + } + } +} \ No newline at end of file diff --git a/src/Orchard/ContentManagement/MetaData/IContentDefinitionWriter.cs b/src/Orchard/ContentManagement/MetaData/IContentDefinitionWriter.cs new file mode 100644 index 000000000..bc2b6f908 --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/IContentDefinitionWriter.cs @@ -0,0 +1,9 @@ +using System.Xml.Linq; +using Orchard.ContentManagement.MetaData.Models; + +namespace Orchard.ContentManagement.MetaData { + public interface IContentDefinitionWriter : IDependency{ + XElement Export(ContentTypeDefinition typeDefinition); + XElement Export(ContentPartDefinition partDefinition); + } +} diff --git a/src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionReader.cs b/src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionReader.cs new file mode 100644 index 000000000..ad1037632 --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionReader.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Xml; +using System.Xml.Linq; +using Orchard.ContentManagement.MetaData.Builders; + +namespace Orchard.ContentManagement.MetaData.Services { + public class ContentDefinitionReader : IContentDefinitionReader { + private readonly IMapper<XElement, IDictionary<string, string>> _settingsReader; + + public ContentDefinitionReader(IMapper<XElement, IDictionary<string, string>> settingsReader) { + _settingsReader = settingsReader; + } + + public void Merge(XElement source, ContentTypeDefinitionBuilder builder) { + builder.Named(XmlConvert.DecodeName(source.Name.LocalName)); + foreach (var setting in _settingsReader.Map(source)) { + builder.WithSetting(setting.Key, setting.Value); + } + foreach (var iter in source.Elements()) { + var partElement = iter; + builder.WithPart( + XmlConvert.DecodeName(partElement.Name.LocalName), + partBuilder => { + foreach (var setting in _settingsReader.Map(partElement)) { + partBuilder.WithSetting(setting.Key, setting.Value); + } + }); + } + } + } +} \ No newline at end of file diff --git a/src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionWriter.cs b/src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionWriter.cs new file mode 100644 index 000000000..fc61eb16e --- /dev/null +++ b/src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionWriter.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Xml; +using System.Xml.Linq; +using Orchard.ContentManagement.MetaData.Models; + +namespace Orchard.ContentManagement.MetaData.Services { + public class ContentDefinitionWriter : IContentDefinitionWriter { + private readonly IMapper<IDictionary<string, string>, XElement> _settingsWriter; + + public ContentDefinitionWriter(IMapper<IDictionary<string, string>, XElement> settingsWriter) { + _settingsWriter = settingsWriter; + } + + public XElement Export(ContentTypeDefinition typeDefinition) { + var typeElement = NewElement(typeDefinition.Name, typeDefinition.Settings); + + foreach(var typePart in typeDefinition.Parts) { + typeElement.Add(NewElement(typePart.PartDefinition.Name, typePart.Settings)); + } + return typeElement; + } + + public XElement Export(ContentPartDefinition partDefinition) { + var partElement = NewElement(partDefinition.Name, partDefinition.Settings); + foreach(var partField in partDefinition.Fields) { + var partFieldElement = NewElement(partField.Name, partField.Settings); + partFieldElement.SetAttributeValue("FieldType", partField.FieldDefinition.Name); + partElement.Add(partFieldElement); + } + return partElement; + } + + private XElement NewElement(string name, IDictionary<string, string> settings) { + var element = new XElement(XmlConvert.EncodeLocalName(name)); + foreach(var settingAttribute in _settingsWriter.Map(settings).Attributes()) { + element.Add(settingAttribute); + } + return element; + } + } +} diff --git a/src/Orchard/ContentManagement/MetaData/Services/SettingsFormatter.cs b/src/Orchard/ContentManagement/MetaData/Services/SettingsFormatter.cs index f7a32f8dc..293a10018 100644 --- a/src/Orchard/ContentManagement/MetaData/Services/SettingsFormatter.cs +++ b/src/Orchard/ContentManagement/MetaData/Services/SettingsFormatter.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using System.Xml; using System.Xml.Linq; namespace Orchard.ContentManagement.MetaData.Services { @@ -11,14 +12,14 @@ namespace Orchard.ContentManagement.MetaData.Services { if (source == null) return new Dictionary<string, string>(); - return source.Attributes().ToDictionary(attr => attr.Name.LocalName, attr => attr.Value); + return source.Attributes().ToDictionary(attr => XmlConvert.DecodeName(attr.Name.LocalName), attr => attr.Value); } public XElement Map(IDictionary<string, string> source) { if (source == null) return new XElement("settings"); - return new XElement("settings", source.Select(kv => new XAttribute(kv.Key, kv.Value))); + return new XElement("settings", source.Select(kv => new XAttribute(XmlConvert.EncodeLocalName(kv.Key), kv.Value))); } } } diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 80aea76e8..6195a1980 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -296,7 +296,10 @@ <Compile Include="ContentManagement\MetaData\ContentPartInfo.cs"> <SubType>Code</SubType> </Compile> + <Compile Include="ContentManagement\MetaData\Services\ContentDefinitionWriter.cs" /> <Compile Include="ContentManagement\MetaData\IContentDefinitionManager.cs" /> + <Compile Include="ContentManagement\MetaData\IContentDefinitionReader.cs" /> + <Compile Include="ContentManagement\MetaData\IContentDefinitionWriter.cs" /> <Compile Include="ContentManagement\MetaData\Models\ContentFieldDefinition.cs" /> <Compile Include="ContentManagement\MetaData\Models\ContentPartDefinition.cs"> <SubType>Code</SubType> @@ -304,6 +307,7 @@ <Compile Include="ContentManagement\MetaData\Models\ContentTypeDefinition.cs"> <SubType>Code</SubType> </Compile> + <Compile Include="ContentManagement\MetaData\Services\ContentDefinitionReader.cs" /> <Compile Include="ContentManagement\MetaData\Services\SettingsFormatter.cs" /> <Compile Include="ContentManagement\Records\ContentItemAlteration.cs"> <SubType>Code</SubType> From a17e5a625c9bd3f24f69f9326ff3e00f6feb5182 Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Mon, 7 Jun 2010 11:18:08 -0700 Subject: [PATCH 42/66] Adding more index commands at content item level (refresh, delete) --HG-- branch : dev --- .../Indexing/Commands/IndexingCommands.cs | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Core/Indexing/Commands/IndexingCommands.cs b/src/Orchard.Web/Core/Indexing/Commands/IndexingCommands.cs index abd6ec068..2cb83c3e6 100644 --- a/src/Orchard.Web/Core/Indexing/Commands/IndexingCommands.cs +++ b/src/Orchard.Web/Core/Indexing/Commands/IndexingCommands.cs @@ -5,17 +5,24 @@ using Orchard.Commands; using Orchard.ContentManagement; using Orchard.Indexing; using Orchard.Security; +using Orchard.Tasks.Indexing; namespace Orchard.Core.Indexing.Commands { public class IndexingCommands : DefaultOrchardCommandHandler { private readonly IEnumerable<IIndexNotifierHandler> _indexNotifierHandlers; private readonly IIndexManager _indexManager; + private readonly IIndexingTaskManager _indexingTaskManager; + private readonly IContentManager _contentManager; private const string SearchIndexName = "Search"; public IndexingCommands( IEnumerable<IIndexNotifierHandler> indexNotifierHandlers, - IIndexManager indexManager) { + IIndexManager indexManager, + IIndexingTaskManager indexingTaskManager, + IContentManager contentManager) { _indexNotifierHandlers = indexNotifierHandlers; + _indexingTaskManager = indexingTaskManager; + _contentManager = contentManager; _indexManager = indexManager; } @@ -25,6 +32,9 @@ namespace Orchard.Core.Indexing.Commands { [OrchardSwitch] public string Query { get; set; } + [OrchardSwitch] + public string ContentItemId { get; set; } + [CommandName("index update")] [CommandHelp("index update [/IndexName:<index name>]\r\n\t" + "Updates the index with the specified <index name>, or the search index if not specified")] [OrchardSwitches("IndexName")] @@ -97,5 +107,36 @@ namespace Orchard.Core.Indexing.Commands { Context.Output.WriteLine("Number of indexed documents: {0}", _indexManager.GetSearchIndexProvider().NumDocs(indexName)); return ""; } + + [CommandName("index refresh")] + [CommandHelp("index refresh /ContenItem:<content item id> \r\n\t" + "Refreshes the index for the specifed <content item id>")] + [OrchardSwitches("ContentItem")] + public string Refresh() { + int contenItemId; + if ( !int.TryParse(ContentItemId, out contenItemId) ) { + return "Invalid content item id. Not an integer."; + } + + var contentItem = _contentManager.Get(contenItemId); + _indexingTaskManager.CreateUpdateIndexTask(contentItem); + + return "Content Item marked for reindexing"; + } + + [CommandName("index delete")] + [CommandHelp("index delete /ContenItem:<content item id>\r\n\t" + "Deletes the specifed <content item id> fromthe index")] + [OrchardSwitches("ContentItem")] + public string Delete() { + int contenItemId; + if(!int.TryParse(ContentItemId, out contenItemId)) { + return "Invalid content item id. Not an integer."; + } + + var contentItem = _contentManager.Get(contenItemId); + _indexingTaskManager.CreateDeleteIndexTask(contentItem); + + return "Content Item marked for deletion"; + } + } } \ No newline at end of file From 887439352d51d2cf2cbe3cfb180387cbf6717731 Mon Sep 17 00:00:00 2001 From: Suha Can <Suha.Can@microsoft.com> Date: Mon, 7 Jun 2010 11:22:40 -0700 Subject: [PATCH 43/66] - Adding a module for content item localization. --HG-- branch : dev --- src/Orchard.Web/Core/Localization/Models/Localized.cs | 9 +++++++++ .../Core/Localization/Models/LocalizedRecord.cs | 6 ++++++ src/Orchard.Web/Core/Localization/Module.txt | 11 +++++++++++ .../Services/IContentItemLocalizationService.cs | 4 ++++ src/Orchard.Web/Core/Orchard.Core.csproj | 4 ++++ .../Modules/Orchard.Setup/Services/SetupService.cs | 1 + 6 files changed, 35 insertions(+) create mode 100644 src/Orchard.Web/Core/Localization/Models/Localized.cs create mode 100644 src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs create mode 100644 src/Orchard.Web/Core/Localization/Module.txt create mode 100644 src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs diff --git a/src/Orchard.Web/Core/Localization/Models/Localized.cs b/src/Orchard.Web/Core/Localization/Models/Localized.cs new file mode 100644 index 000000000..8c6165b2e --- /dev/null +++ b/src/Orchard.Web/Core/Localization/Models/Localized.cs @@ -0,0 +1,9 @@ +using System.Web.Mvc; +using Orchard.ContentManagement; + +namespace Orchard.Core.Localization.Models { + public sealed class Localized : ContentPart<LocalizedRecord> { + [HiddenInput(DisplayValue = false)] + public int Id { get { return ContentItem.Id; } } + } +} diff --git a/src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs b/src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs new file mode 100644 index 000000000..0e45ddf94 --- /dev/null +++ b/src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs @@ -0,0 +1,6 @@ +using Orchard.ContentManagement.Records; + +namespace Orchard.Core.Localization.Models { + public class LocalizedRecord : ContentPartRecord { + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Module.txt b/src/Orchard.Web/Core/Localization/Module.txt new file mode 100644 index 000000000..6cb082dda --- /dev/null +++ b/src/Orchard.Web/Core/Localization/Module.txt @@ -0,0 +1,11 @@ +name: Localization +antiforgery: enabled +author: The Orchard Team +website: http://orchardproject.net +version: 0.1 +orchardversion: 0.1.2010.0312 +description: Support for localizing content items for cultures. +features: + Localization: + Description: Localize content items. + Category: Core \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs b/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs new file mode 100644 index 000000000..974034aa4 --- /dev/null +++ b/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs @@ -0,0 +1,4 @@ +namespace Orchard.Core.Localization.Services { + public interface IContentItemLocalizationService : IDependency { + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 0784d1b15..69d4363bf 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -119,6 +119,9 @@ <Compile Include="Indexing\Services\CreateIndexingTaskHandler.cs" /> <Compile Include="Indexing\Services\IndexingTaskExecutor.cs" /> <Compile Include="Indexing\Services\IndexingTaskManager.cs" /> + <Compile Include="Localization\Models\Localized.cs" /> + <Compile Include="Localization\Models\LocalizedRecord.cs" /> + <Compile Include="Localization\Services\IContentItemLocalizationService.cs" /> <Compile Include="Navigation\AdminMenu.cs" /> <Compile Include="Navigation\Controllers\AdminController.cs" /> <Compile Include="Navigation\Models\MenuItem.cs" /> @@ -180,6 +183,7 @@ <ItemGroup> <Content Include="Common\Module.txt" /> <Content Include="Indexing\Module.txt" /> + <Content Include="Localization\Module.txt" /> <Content Include="Settings\Module.txt" /> <Content Include="Settings\Views\Admin\Index.ascx" /> <Content Include="Web.config" /> diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index 49cbb27d4..d9eb7ddbd 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -63,6 +63,7 @@ namespace Orchard.Setup.Services { "Navigation", "Scheduling", "Indexing", + "Localization", "Settings", "XmlRpc", "Orchard.Users", From 11c5ff1a4296581efd0b5f0cfe95129ba6046b0c Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Mon, 7 Jun 2010 12:26:32 -0700 Subject: [PATCH 44/66] Changed querying behavior to handle special characters (like C#) --HG-- branch : dev --- .../Indexing/DefaultSearchBuilderTests.cs | 14 +++++++++++ .../Indexing/Lucene/DefaultIndexProvider.cs | 8 ++++++- .../Indexing/Lucene/DefaultSearchBuilder.cs | 23 ++++++++++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Core.Tests/Indexing/DefaultSearchBuilderTests.cs b/src/Orchard.Core.Tests/Indexing/DefaultSearchBuilderTests.cs index 9ffa62d6c..b28036c57 100644 --- a/src/Orchard.Core.Tests/Indexing/DefaultSearchBuilderTests.cs +++ b/src/Orchard.Core.Tests/Indexing/DefaultSearchBuilderTests.cs @@ -177,5 +177,19 @@ namespace Orchard.Tests.Indexing { Assert.That(date[0].GetDateTime("date") < date[1].GetDateTime("date"), Is.True); Assert.That(date[1].GetDateTime("date") < date[2].GetDateTime("date"), Is.True); } + + [Test] + public void ShouldEscapeSpecialChars() { + _provider.CreateIndex("default"); + _provider.Store("default", _provider.New(1).Add("body", "Orchard has been developped in C#")); + _provider.Store("default", _provider.New(2).Add("body", "Windows has been developped in C++")); + + var cs = _searchBuilder.WithField("body", "C#").Search().ToList(); + Assert.That(cs.Count(), Is.EqualTo(2)); + + var cpp = _searchBuilder.WithField("body", "C++").Search().ToList(); + Assert.That(cpp.Count(), Is.EqualTo(2)); + + } } } diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs index 7c9f9d8ce..8132e1a54 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexProvider.cs @@ -23,7 +23,7 @@ namespace Orchard.Core.Indexing.Lucene { private readonly IAppDataFolder _appDataFolder; private readonly ShellSettings _shellSettings; public static readonly Version LuceneVersion = Version.LUCENE_29; - private readonly Analyzer _analyzer = new StandardAnalyzer(LuceneVersion); + private readonly Analyzer _analyzer ; private readonly string _basePath; public static readonly DateTime DefaultMinDateTime = new DateTime(1980, 1, 1); public static readonly string Settings = "Settings"; @@ -34,6 +34,7 @@ namespace Orchard.Core.Indexing.Lucene { public DefaultIndexProvider(IAppDataFolder appDataFolder, ShellSettings shellSettings) { _appDataFolder = appDataFolder; _shellSettings = shellSettings; + _analyzer = CreateAnalyzer(); // TODO: (sebros) Find a common way to get where tenant's specific files should go. "Sites/Tenant" is hard coded in multiple places _basePath = Path.Combine("Sites", _shellSettings.Name, "Indexes"); @@ -44,6 +45,11 @@ namespace Orchard.Core.Indexing.Lucene { EnsureDirectoryExists(); } + public static Analyzer CreateAnalyzer() { + // StandardAnalyzer does lower-case and stop-word filtering. It also removes punctuation + return new StandardAnalyzer(LuceneVersion); + } + private void EnsureDirectoryExists() { var directory = new DirectoryInfo(_appDataFolder.MapPath(_basePath)); if(!directory.Exists) { diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs index c73192c52..47aae8ac2 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs @@ -2,12 +2,15 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using Lucene.Net.Analysis; +using Lucene.Net.Analysis.Tokenattributes; using Lucene.Net.Index; using Lucene.Net.Search; using Lucene.Net.Store; using Orchard.Logging; using Lucene.Net.Documents; using Orchard.Indexing; +using Lucene.Net.QueryParsers; namespace Orchard.Core.Indexing.Lucene { public class DefaultSearchBuilder : ISearchBuilder { @@ -23,6 +26,8 @@ namespace Orchard.Core.Indexing.Lucene { private readonly Dictionary<string, DateTime> _after; private string _sort; private bool _sortDescending; + private string _parse; + private readonly Analyzer _analyzer; public ILogger Logger { get; set; } @@ -37,9 +42,12 @@ namespace Orchard.Core.Indexing.Lucene { _fields = new Dictionary<string, Query[]>(); _sort = String.Empty; _sortDescending = true; + _parse = String.Empty; + _analyzer = DefaultIndexProvider.CreateAnalyzer(); } public ISearchBuilder Parse(string query) { + _parse = query; return this; } @@ -49,8 +57,17 @@ namespace Orchard.Core.Indexing.Lucene { public ISearchBuilder WithField(string field, string value, bool wildcardSearch) { - _fields[field] = value.Split(' ') + var tokens = new List<string>(); + using(var sr = new System.IO.StringReader(value)) { + var stream = _analyzer.TokenStream(field, sr); + while(stream.IncrementToken()) { + tokens.Add(((TermAttribute)stream.GetAttribute(typeof(TermAttribute))).Term()); + } + } + + _fields[field] = tokens .Where(k => !String.IsNullOrWhiteSpace(k)) + .Select(QueryParser.Escape) .Select(k => wildcardSearch ? (Query)new PrefixQuery(new Term(field, k)) : new TermQuery(new Term(k))) .ToArray(); @@ -93,6 +110,10 @@ namespace Orchard.Core.Indexing.Lucene { } private Query CreateQuery() { + if(!String.IsNullOrWhiteSpace(_parse)) { + return new QueryParser(DefaultIndexProvider.LuceneVersion, "body", DefaultIndexProvider.CreateAnalyzer()).Parse(_parse); + } + var query = new BooleanQuery(); if ( _fields.Keys.Count > 0 ) { // apply specific filters if defined From 83db8e0b4203d9321a640542f990986da4130a56 Mon Sep 17 00:00:00 2001 From: Suha Can <Suha.Can@microsoft.com> Date: Mon, 7 Jun 2010 12:29:29 -0700 Subject: [PATCH 45/66] - More work on the citem localization, still early stages (updates to services and models). --HG-- branch : dev --- .../Core/Localization/Models/Localized.cs | 11 +++++ .../Localization/Models/LocalizedRecord.cs | 2 + .../ContentItemLocalizationService.cs | 40 +++++++++++++++++++ .../IContentItemLocalizationService.cs | 8 +++- src/Orchard.Web/Core/Orchard.Core.csproj | 1 + .../Services/DefaultCultureManager.cs | 8 ++++ .../Localization/Services/ICultureManager.cs | 1 + 7 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 src/Orchard.Web/Core/Localization/Services/ContentItemLocalizationService.cs diff --git a/src/Orchard.Web/Core/Localization/Models/Localized.cs b/src/Orchard.Web/Core/Localization/Models/Localized.cs index 8c6165b2e..897b5bc99 100644 --- a/src/Orchard.Web/Core/Localization/Models/Localized.cs +++ b/src/Orchard.Web/Core/Localization/Models/Localized.cs @@ -5,5 +5,16 @@ namespace Orchard.Core.Localization.Models { public sealed class Localized : ContentPart<LocalizedRecord> { [HiddenInput(DisplayValue = false)] public int Id { get { return ContentItem.Id; } } + + public int CultureId { + get { return Record.CultureId; } + set { Record.CultureId = value; } + } + + public int MasterContentItemId { + get { return Record.MasterContentItemId; } + set { Record.MasterContentItemId = value; } + } + } } diff --git a/src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs b/src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs index 0e45ddf94..cab717d5f 100644 --- a/src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs +++ b/src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs @@ -2,5 +2,7 @@ namespace Orchard.Core.Localization.Models { public class LocalizedRecord : ContentPartRecord { + public virtual int CultureId { get; set; } + public virtual int MasterContentItemId { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Services/ContentItemLocalizationService.cs b/src/Orchard.Web/Core/Localization/Services/ContentItemLocalizationService.cs new file mode 100644 index 000000000..e89f0820e --- /dev/null +++ b/src/Orchard.Web/Core/Localization/Services/ContentItemLocalizationService.cs @@ -0,0 +1,40 @@ +using System.Collections.Generic; +using System.Linq; +using JetBrains.Annotations; +using Orchard.ContentManagement; +using Orchard.Core.Localization.Models; +using Orchard.Localization.Services; +using Localized = Orchard.Core.Localization.Models.Localized; + +namespace Orchard.Core.Localization.Services { + [UsedImplicitly] + public class ContentItemLocalizationService : IContentItemLocalizationService { + private readonly IContentManager _contentManager; + private readonly ICultureManager _cultureManager; + + public ContentItemLocalizationService(IContentManager contentManager, ICultureManager cultureManager) { + _contentManager = contentManager; + _cultureManager = cultureManager; + } + + public IEnumerable<Localized> Get() { + return _contentManager.Query<Localized, LocalizedRecord>().List(); + } + + public Localized Get(int localizedId) { + return _contentManager.Get<Localized>(localizedId); + } + + public Localized GetLocalizationForCulture(int masterId, string cultureName) { + var cultures = _cultureManager.ListCultures(); + if (cultures.Contains(cultureName)) { + int cultureId = _cultureManager.GetCultureIdByName(cultureName); + if (cultureId != 0) { + return _contentManager.Query<Localized, LocalizedRecord>() + .Where(x => x.MasterContentItemId == masterId && x.CultureId == cultureId).List().FirstOrDefault(); + } + } + return null; + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs b/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs index 974034aa4..87a5eb993 100644 --- a/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs +++ b/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs @@ -1,4 +1,10 @@ -namespace Orchard.Core.Localization.Services { +using System.Collections.Generic; +using Orchard.Core.Localization.Models; + +namespace Orchard.Core.Localization.Services { public interface IContentItemLocalizationService : IDependency { + IEnumerable<Localized> Get(); + Localized Get(int localizedId); + Localized GetLocalizationForCulture(int masterId, string cultureName); } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 69d4363bf..340d874ec 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -121,6 +121,7 @@ <Compile Include="Indexing\Services\IndexingTaskManager.cs" /> <Compile Include="Localization\Models\Localized.cs" /> <Compile Include="Localization\Models\LocalizedRecord.cs" /> + <Compile Include="Localization\Services\ContentItemLocalizationService.cs" /> <Compile Include="Localization\Services\IContentItemLocalizationService.cs" /> <Compile Include="Navigation\AdminMenu.cs" /> <Compile Include="Navigation\Controllers\AdminController.cs" /> diff --git a/src/Orchard/Localization/Services/DefaultCultureManager.cs b/src/Orchard/Localization/Services/DefaultCultureManager.cs index 36a48f445..ae77a121c 100644 --- a/src/Orchard/Localization/Services/DefaultCultureManager.cs +++ b/src/Orchard/Localization/Services/DefaultCultureManager.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Text.RegularExpressions; using System.Web; @@ -46,6 +47,13 @@ namespace Orchard.Localization.Services { return String.Empty; } + public int GetCultureIdByName(string cultureName) { + if (!IsValidCulture(cultureName)) { + throw new ArgumentException("cultureName"); + } + return _cultureRepository.Get(x => x.Culture == cultureName).Id; + } + // "<languagecode2>" or // "<languagecode2>-<country/regioncode2>" or // "<languagecode2>-<scripttag>-<country/regioncode2>" diff --git a/src/Orchard/Localization/Services/ICultureManager.cs b/src/Orchard/Localization/Services/ICultureManager.cs index 2a55558f1..53c7d13af 100644 --- a/src/Orchard/Localization/Services/ICultureManager.cs +++ b/src/Orchard/Localization/Services/ICultureManager.cs @@ -6,5 +6,6 @@ namespace Orchard.Localization.Services { IEnumerable<string> ListCultures(); void AddCulture(string cultureName); string GetCurrentCulture(HttpContext requestContext); + int GetCultureIdByName(string cultureName); } } From 8adc11880300d645ef2cf7699e22d1d0d5d78a8d Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Mon, 7 Jun 2010 12:33:19 -0700 Subject: [PATCH 46/66] Added defaultField in Parse() method --HG-- branch : dev --- .../Core/Indexing/Lucene/DefaultSearchBuilder.cs | 14 ++++++++++++-- src/Orchard/Indexing/ISearchBuilder.cs | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs index 47aae8ac2..93a084672 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs @@ -28,6 +28,7 @@ namespace Orchard.Core.Indexing.Lucene { private bool _sortDescending; private string _parse; private readonly Analyzer _analyzer; + private string _defaultField; public ILogger Logger { get; set; } @@ -46,7 +47,16 @@ namespace Orchard.Core.Indexing.Lucene { _analyzer = DefaultIndexProvider.CreateAnalyzer(); } - public ISearchBuilder Parse(string query) { + public ISearchBuilder Parse(string defaultField, string query) { + if ( String.IsNullOrWhiteSpace(defaultField) ) { + throw new ArgumentException("Default field can't be empty"); + } + + if ( String.IsNullOrWhiteSpace(query) ) { + throw new ArgumentException("Query can't be empty"); + } + + _defaultField = defaultField; _parse = query; return this; } @@ -111,7 +121,7 @@ namespace Orchard.Core.Indexing.Lucene { private Query CreateQuery() { if(!String.IsNullOrWhiteSpace(_parse)) { - return new QueryParser(DefaultIndexProvider.LuceneVersion, "body", DefaultIndexProvider.CreateAnalyzer()).Parse(_parse); + return new QueryParser(DefaultIndexProvider.LuceneVersion, _defaultField, DefaultIndexProvider.CreateAnalyzer()).Parse(_parse); } var query = new BooleanQuery(); diff --git a/src/Orchard/Indexing/ISearchBuilder.cs b/src/Orchard/Indexing/ISearchBuilder.cs index 3994a37bd..83e3ffda4 100644 --- a/src/Orchard/Indexing/ISearchBuilder.cs +++ b/src/Orchard/Indexing/ISearchBuilder.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace Orchard.Indexing { public interface ISearchBuilder { - ISearchBuilder Parse(string query); + ISearchBuilder Parse(string defaultField, string query); ISearchBuilder WithField(string field, string value); ISearchBuilder WithField(string field, string value, bool wildcardSearch); From a273c13205634bd685bacff37eb742569dd05d7e Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Mon, 7 Jun 2010 15:52:26 -0700 Subject: [PATCH 47/66] A bit of an improvement in paging - generic collection and display but only used for search results at the moment and does nothing for other queries. in other words, build your own IPageOfItems --HG-- branch : dev --- .../Controllers/SearchController.cs | 24 ++++------------ .../Orchard.Search/Services/ISearchService.cs | 5 ++-- .../Orchard.Search/Services/SearchService.cs | 20 ++++++++----- .../ViewModels/SearchViewModel.cs | 9 ++---- .../Orchard.Search/Views/Search/Index.ascx | 10 +++---- src/Orchard/Collections/IPageOfItems.cs | 12 ++++++++ src/Orchard/Collections/PageOfItems.cs | 28 +++++++++++++++++++ src/Orchard/Mvc/Html/HtmlHelperExtensions.cs | 24 ++++++++++------ src/Orchard/Orchard.Framework.csproj | 2 ++ 9 files changed, 88 insertions(+), 46 deletions(-) create mode 100644 src/Orchard/Collections/IPageOfItems.cs create mode 100644 src/Orchard/Collections/PageOfItems.cs diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs index fb0fca24a..ba7f8f63d 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -15,29 +15,17 @@ namespace Orchard.Search.Controllers { _contentManager = contentManager; } - public ActionResult Index(string q, int page = 0, int pageSize = 0) { - var take = pageSize > 0 ? pageSize : 10; - var skip = (page > 0 ? page - 1 : 0) * take; + public ActionResult Index(string q, int page = 1, int pageSize = 10) { var searchViewModel = new SearchViewModel { Query = q, - Page = page > 0 ? page : 1, - PageSize = take + DefaultPageSize = 10, // <- yeah, I know :| + PageOfResults = _searchService.Query(q, page, pageSize, searchHit => new SearchResultViewModel { + Content = _contentManager.BuildDisplayModel(_contentManager.Get(searchHit.Id), "SummaryForSearch"), + SearchHit = searchHit + }) }; - var results = _searchService.Query(q, skip, take); - - if (results == null) - return View(searchViewModel); - - searchViewModel.Count = results.TotalCount; - searchViewModel.TotalPageCount = (int)Math.Ceiling((decimal)searchViewModel.Count/searchViewModel.PageSize); //todo: deal with page requests beyond result count - searchViewModel.ResultsPage = results.Page - .Select(result => new SearchResultViewModel { - Content = _contentManager.BuildDisplayModel(_contentManager.Get(result.Id), "SummaryForSearch"), - SearchHit = result - }) - .ToList(); return View(searchViewModel); } diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs index 38e1b332f..0437e73ba 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/ISearchService.cs @@ -1,10 +1,11 @@ using System; -using Orchard.Search.Models; +using Orchard.Collections; +using Orchard.Indexing; namespace Orchard.Search.Services { public interface ISearchService : IDependency { bool HasIndexToManage { get; } - ISearchResult Query(string query, int skip, int? take); + IPageOfItems<T> Query<T>(string query, int skip, int? take, Func<ISearchHit, T> shapeResult); void RebuildIndex(); void UpdateIndex(); DateTime GetIndexUpdatedUtc(); diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs index f10297398..f68d0919e 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.Linq; +using Orchard.Collections; using Orchard.Indexing; using Orchard.Localization; using Orchard.Search.Models; @@ -27,23 +29,27 @@ namespace Orchard.Search.Services get { return _indexManager.HasIndexProvider(); } } - ISearchResult ISearchService.Query(string query, int skip, int? take) { + IPageOfItems<T> ISearchService.Query<T>(string query, int page, int? pageSize, Func<ISearchHit, T> shapeResult) { if (string.IsNullOrWhiteSpace(query) || !_indexManager.HasIndexProvider()) return null; - var searchBuilder = _indexManager.GetSearchIndexProvider().CreateSearchBuilder(SearchIndexName) + var searchBuilder = _indexManager.GetSearchIndexProvider().CreateSearchBuilder(SearchIndexName) .WithField("title", query) .WithField("body", query); var totalCount = searchBuilder.Count(); - if (take != null) + if (pageSize != null) searchBuilder = searchBuilder - .Slice(skip, (int)take); + .Slice((page > 0 ? page - 1 : 0) * (int)pageSize, (int)pageSize); - return new SearchResult { - Page = searchBuilder.Search(), - TotalCount = totalCount + + var pageOfItems = new PageOfItems<T>(searchBuilder.Search().Select(shapeResult)) { + PageNumber = page, + PageSize = pageSize != null ? (int) pageSize : totalCount, + TotalItemCount = totalCount }; + + return pageOfItems; } void ISearchService.RebuildIndex() { diff --git a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs index 95fe09102..3da6fc7cb 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchViewModel.cs @@ -1,13 +1,10 @@ -using System.Collections.Generic; +using Orchard.Collections; using Orchard.Mvc.ViewModels; namespace Orchard.Search.ViewModels { public class SearchViewModel : BaseViewModel { - public IEnumerable<SearchResultViewModel> ResultsPage { get; set; } - public int Count { get; set; } - public int Page { get; set; } - public int PageSize { get; set; } - public int TotalPageCount { get; set; } public string Query { get; set; } + public int DefaultPageSize { get; set; } + public IPageOfItems<SearchResultViewModel> PageOfResults { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx index 7705343c5..472083772 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx @@ -4,14 +4,14 @@ Html.RegisterStyle("search.css"); %> <h1><%=Html.TitleForPage(T("Search").Text)%></h1><% Html.Zone("search"); if (!string.IsNullOrWhiteSpace(Model.Query)) { - if (Model.Count == 0) { %> + if (Model.PageOfResults.Count() == 0) { %> <p class="search-summary"><%=T("<em>zero</em> results") %></p><% } else { %> - <p class="search-summary"><%=T("<em>{0} - {1}</em> of <em>{2}</em> results", (Model.Page - 1) * Model.PageSize + 1, Model.Page * Model.PageSize > Model.Count ? Model.Count : Model.Page * Model.PageSize, Model.Count)%></p><% + <p class="search-summary"><%=T("<em>{0} - {1}</em> of <em>{2}</em> results", Model.PageOfResults.StartPosition, Model.PageOfResults.EndPosition, Model.PageOfResults.TotalItemCount)%></p><% } } -if (Model.ResultsPage != null && Model.ResultsPage.Count() > 0) { %> -<%=Html.UnorderedList(Model.ResultsPage, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString(), "search-results contentItems") %> -<%=Html.Pager(Model.TotalPageCount, Model.Page, new {q = Model.Query}) %><% +if (Model.PageOfResults != null && Model.PageOfResults.Count() > 0) { %> +<%=Html.UnorderedList(Model.PageOfResults, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString() , "search-results contentItems") %> +<%=Html.Pager(Model.PageOfResults, Model.PageOfResults.PageNumber, Model.DefaultPageSize, new {q = Model.Query}) %><% } %> \ No newline at end of file diff --git a/src/Orchard/Collections/IPageOfItems.cs b/src/Orchard/Collections/IPageOfItems.cs new file mode 100644 index 000000000..4ed9362bd --- /dev/null +++ b/src/Orchard/Collections/IPageOfItems.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; + +namespace Orchard.Collections { + public interface IPageOfItems<out T> : IEnumerable<T> { + int PageNumber { get; set; } + int PageSize { get; set; } + int TotalItemCount { get; set; } + int TotalPageCount { get; } + int StartPosition { get; } + int EndPosition { get; } + } +} \ No newline at end of file diff --git a/src/Orchard/Collections/PageOfItems.cs b/src/Orchard/Collections/PageOfItems.cs new file mode 100644 index 000000000..3e69aa696 --- /dev/null +++ b/src/Orchard/Collections/PageOfItems.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; + +namespace Orchard.Collections { + public class PageOfItems<T> : List<T>, IPageOfItems<T> { + public PageOfItems(IEnumerable<T> items) { + AddRange(items); + } + + #region IPageOfItems<T> Members + + public int PageNumber { get; set; } + public int PageSize { get; set; } + public int TotalItemCount { get; set; } + + public int TotalPageCount { + get { return (int) Math.Ceiling((double) TotalItemCount/PageSize); } + } + public int StartPosition { + get { return (PageNumber - 1)*PageSize + 1; } + } + public int EndPosition { + get { return PageNumber * PageSize > TotalItemCount ? TotalItemCount : PageNumber * PageSize; } + } + + #endregion + } +} \ No newline at end of file diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs index 5610daebe..c302658aa 100644 --- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs +++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Text; -using System.Text.RegularExpressions; using System.Web.Mvc; using System.Web.Mvc.Html; using System.Web.Routing; +using Orchard.Collections; using Orchard.Mvc.ViewModels; using Orchard.Services; using Orchard.Settings; @@ -40,21 +40,25 @@ namespace Orchard.Mvc.Html { return MvcHtmlString.Create(builder.ToString(TagRenderMode.Normal)); } + #region Pager - public static string Pager(this HtmlHelper html, int pageCount, int currentPage, object values = null, string previousText = "<", string nextText = ">", bool alwaysShowPreviousAndNext = false) { - if (pageCount < 2) + public static string Pager<T>(this HtmlHelper html, IPageOfItems<T> pageOfItems, int currentPage, int defaultPageSize, object values = null, string previousText = "<", string nextText = ">", bool alwaysShowPreviousAndNext = false) { + if (pageOfItems.TotalPageCount < 2) return ""; var sb = new StringBuilder(75); + var rvd = new RouteValueDictionary {{"q", ""},{"page", 0}}; var viewContext = html.ViewContext; - var rvd = new RouteValueDictionary(); + var urlHelper = new UrlHelper(viewContext.RequestContext); + + if (pageOfItems.PageSize != defaultPageSize) + rvd.Add("pagesize", pageOfItems.PageSize); foreach (var item in viewContext.RouteData.Values) { rvd.Add(item.Key, item.Value); } - var urlHelper = new UrlHelper(viewContext.RequestContext); if (values != null) { var rvd2 = new RouteValueDictionary(values); @@ -77,18 +81,22 @@ namespace Orchard.Mvc.Html { } //todo: when there are many pages (> 15?) maybe do something like 1 2 3...6 7 8...13 14 15 - for (var p = 1; p <= pageCount; p++) { + for (var p = 1; p <= pageOfItems.TotalPageCount; p++) { if (p == currentPage) { sb.AppendFormat(" <span>{0}</span>", p); } else { - rvd["page"] = p; + if (p == 1) + rvd.Remove("page"); + else + rvd["page"] = p; + sb.AppendFormat(" <a href=\"{1}\">{0}</a>", p, urlHelper.RouteUrl(rvd)); } } - if (currentPage < pageCount || alwaysShowPreviousAndNext) { + if (currentPage < pageOfItems.TotalPageCount || alwaysShowPreviousAndNext) { rvd["page"] = currentPage + 1; sb.AppendFormat("<a href=\"{1}\" class=\"next\">{0}</a>", nextText, urlHelper.RouteUrl(rvd)); diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 129d4177f..249a3dc12 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -130,6 +130,8 @@ </Reference> </ItemGroup> <ItemGroup> + <Compile Include="Collections\IPageOfItems.cs" /> + <Compile Include="Collections\PageOfItems.cs" /> <Compile Include="ContentManagement\Aspects\ICommonAspect.cs"> <SubType>Code</SubType> </Compile> From cb7f025f12894cdfb9a9f81dbc6f1d843eae6918 Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Mon, 7 Jun 2010 15:58:15 -0700 Subject: [PATCH 48/66] Fixed up a few specflow tests --HG-- branch : dev --- src/Orchard.Specs/Modules.feature | 8 +------- src/Orchard.Specs/MultiTenancy.feature | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Orchard.Specs/Modules.feature b/src/Orchard.Specs/Modules.feature index 31482a274..2509b5ddd 100644 --- a/src/Orchard.Specs/Modules.feature +++ b/src/Orchard.Specs/Modules.feature @@ -7,15 +7,9 @@ Scenario: Installed modules are listed Given I have installed Orchard When I go to "admin/modules" Then I should see "<h1>Installed Modules</h1>" - And I should see "<h3>Themes</h3>" + And I should see "<h2>Themes" And the status should be 200 OK -Scenario: Edit module shows its features - Given I have installed Orchard - When I go to "admin/modules/Edit/Orchard.Themes" - Then I should see "<h1>Edit Module: Themes</h1>" - And the status should be 200 OK - Scenario: Features of installed modules are listed Given I have installed Orchard When I go to "admin/modules/features" diff --git a/src/Orchard.Specs/MultiTenancy.feature b/src/Orchard.Specs/MultiTenancy.feature index c8602abb4..b6cabfd97 100644 --- a/src/Orchard.Specs/MultiTenancy.feature +++ b/src/Orchard.Specs/MultiTenancy.feature @@ -7,7 +7,7 @@ Scenario: Default site is listed Given I have installed Orchard And I have installed "Orchard.MultiTenancy" When I go to "Admin/MultiTenancy" - Then I should see "List of Site's Tenants" + Then I should see "List of Site's Tenants" And I should see "<span class="tenantName">Default</span>" And the status should be 200 OK From e594abc4636c733c0429c10ff10ce06e2c502fc9 Mon Sep 17 00:00:00 2001 From: Suha Can <Suha.Can@microsoft.com> Date: Mon, 7 Jun 2010 16:00:22 -0700 Subject: [PATCH 49/66] - A handler for localized part. - Finishing up the infrastructure support for content item localization. --HG-- branch : dev --- .../Localization/Handlers/LocalizedHandler.cs | 45 +++++++++++++++++++ .../Core/Localization/Models/Localized.cs | 25 ++++++++--- .../ContentItemLocalizationService.cs | 40 ----------------- .../IContentItemLocalizationService.cs | 10 ----- src/Orchard.Web/Core/Orchard.Core.csproj | 3 +- .../Orchard.Setup/Services/SetupService.cs | 6 +-- .../Services/DefaultCultureManager.cs | 7 +-- .../Localization/Services/ICultureManager.cs | 3 +- 8 files changed, 72 insertions(+), 67 deletions(-) create mode 100644 src/Orchard.Web/Core/Localization/Handlers/LocalizedHandler.cs delete mode 100644 src/Orchard.Web/Core/Localization/Services/ContentItemLocalizationService.cs delete mode 100644 src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs diff --git a/src/Orchard.Web/Core/Localization/Handlers/LocalizedHandler.cs b/src/Orchard.Web/Core/Localization/Handlers/LocalizedHandler.cs new file mode 100644 index 000000000..670e0e6f9 --- /dev/null +++ b/src/Orchard.Web/Core/Localization/Handlers/LocalizedHandler.cs @@ -0,0 +1,45 @@ +using JetBrains.Annotations; +using Orchard.Core.Localization.Models; +using Orchard.Data; +using Orchard.Localization; +using Orchard.ContentManagement; +using Orchard.ContentManagement.Handlers; +using Orchard.Localization.Services; + +namespace Orchard.Core.Localization.Handlers { + [UsedImplicitly] + public class LocalizedHandler : ContentHandler { + private readonly ICultureManager _cultureManager; + private readonly IContentManager _contentManager; + + public LocalizedHandler(IRepository<LocalizedRecord> localizedRepository, ICultureManager cultureManager, IContentManager contentManager) { + _cultureManager = cultureManager; + _contentManager = contentManager; + T = NullLocalizer.Instance; + + Filters.Add(StorageFilter.For(localizedRepository)); + + OnActivated<Localized>(InitializePart); + + OnLoaded<Localized>(LazyLoadHandlers); + } + + public Localizer T { get; set; } + + void LazyLoadHandlers(LoadContentContext context, Localized localized) { + localized.CultureField.Loader(ctx => _cultureManager.GetCultureById(localized.Record.CultureId)); + localized.MasterContentItemField.Loader(ctx => _contentManager.Get(localized.Record.MasterContentItemId)); + } + + void InitializePart(ActivatedContentContext context, Localized localized) { + localized.CultureField.Setter(cultureRecord => { + localized.Record.CultureId = cultureRecord.Id; + return cultureRecord; + }); + localized.MasterContentItemField.Setter(masterContentItem => { + localized.Record.MasterContentItemId = masterContentItem.ContentItem.Id; + return masterContentItem; + }); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Models/Localized.cs b/src/Orchard.Web/Core/Localization/Models/Localized.cs index 897b5bc99..cc703cdae 100644 --- a/src/Orchard.Web/Core/Localization/Models/Localized.cs +++ b/src/Orchard.Web/Core/Localization/Models/Localized.cs @@ -1,20 +1,33 @@ using System.Web.Mvc; using Orchard.ContentManagement; +using Orchard.ContentManagement.Utilities; +using Orchard.Localization.Records; namespace Orchard.Core.Localization.Models { public sealed class Localized : ContentPart<LocalizedRecord> { + private readonly LazyField<CultureRecord> _culture = new LazyField<CultureRecord>(); + private readonly LazyField<IContent> _masterContentItem = new LazyField<IContent>(); + + public LazyField<CultureRecord> CultureField { get { return _culture; } } + public LazyField<IContent> MasterContentItemField { get { return _masterContentItem; } } + [HiddenInput(DisplayValue = false)] public int Id { get { return ContentItem.Id; } } - public int CultureId { - get { return Record.CultureId; } - set { Record.CultureId = value; } + public CultureRecord Culture { + get { return _culture.Value; } + set { _culture.Value = value; } } - public int MasterContentItemId { - get { return Record.MasterContentItemId; } - set { Record.MasterContentItemId = value; } + public IContent MasterContentItem { + get { return _masterContentItem.Value; } + set { _masterContentItem.Value = value; } } + public bool HasTranslationGroup { + get { + return Record.MasterContentItemId != 0; + } + } } } diff --git a/src/Orchard.Web/Core/Localization/Services/ContentItemLocalizationService.cs b/src/Orchard.Web/Core/Localization/Services/ContentItemLocalizationService.cs deleted file mode 100644 index e89f0820e..000000000 --- a/src/Orchard.Web/Core/Localization/Services/ContentItemLocalizationService.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using JetBrains.Annotations; -using Orchard.ContentManagement; -using Orchard.Core.Localization.Models; -using Orchard.Localization.Services; -using Localized = Orchard.Core.Localization.Models.Localized; - -namespace Orchard.Core.Localization.Services { - [UsedImplicitly] - public class ContentItemLocalizationService : IContentItemLocalizationService { - private readonly IContentManager _contentManager; - private readonly ICultureManager _cultureManager; - - public ContentItemLocalizationService(IContentManager contentManager, ICultureManager cultureManager) { - _contentManager = contentManager; - _cultureManager = cultureManager; - } - - public IEnumerable<Localized> Get() { - return _contentManager.Query<Localized, LocalizedRecord>().List(); - } - - public Localized Get(int localizedId) { - return _contentManager.Get<Localized>(localizedId); - } - - public Localized GetLocalizationForCulture(int masterId, string cultureName) { - var cultures = _cultureManager.ListCultures(); - if (cultures.Contains(cultureName)) { - int cultureId = _cultureManager.GetCultureIdByName(cultureName); - if (cultureId != 0) { - return _contentManager.Query<Localized, LocalizedRecord>() - .Where(x => x.MasterContentItemId == masterId && x.CultureId == cultureId).List().FirstOrDefault(); - } - } - return null; - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs b/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs deleted file mode 100644 index 87a5eb993..000000000 --- a/src/Orchard.Web/Core/Localization/Services/IContentItemLocalizationService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; -using Orchard.Core.Localization.Models; - -namespace Orchard.Core.Localization.Services { - public interface IContentItemLocalizationService : IDependency { - IEnumerable<Localized> Get(); - Localized Get(int localizedId); - Localized GetLocalizationForCulture(int masterId, string cultureName); - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 340d874ec..c4da90d3d 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -119,10 +119,9 @@ <Compile Include="Indexing\Services\CreateIndexingTaskHandler.cs" /> <Compile Include="Indexing\Services\IndexingTaskExecutor.cs" /> <Compile Include="Indexing\Services\IndexingTaskManager.cs" /> + <Compile Include="Localization\Handlers\LocalizedHandler.cs" /> <Compile Include="Localization\Models\Localized.cs" /> <Compile Include="Localization\Models\LocalizedRecord.cs" /> - <Compile Include="Localization\Services\ContentItemLocalizationService.cs" /> - <Compile Include="Localization\Services\IContentItemLocalizationService.cs" /> <Compile Include="Navigation\AdminMenu.cs" /> <Compile Include="Navigation\Controllers\AdminController.cs" /> <Compile Include="Navigation\Models\MenuItem.cs" /> diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index d9eb7ddbd..4744dd079 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -173,9 +173,9 @@ namespace Orchard.Setup.Services { } var contentDefinitionManager = environment.Resolve<IContentDefinitionManager>(); - contentDefinitionManager.AlterTypeDefinition("blogpost", cfg => cfg.WithPart("HasComments").WithPart("HasTags")); - contentDefinitionManager.AlterTypeDefinition("page", cfg => cfg.WithPart("HasComments").WithPart("HasTags")); - contentDefinitionManager.AlterTypeDefinition("sandboxpage", cfg => cfg.WithPart("HasComments").WithPart("HasTags")); + contentDefinitionManager.AlterTypeDefinition("blogpost", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized")); + contentDefinitionManager.AlterTypeDefinition("page", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized")); + contentDefinitionManager.AlterTypeDefinition("sandboxpage", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized")); } catch { environment.Resolve<ITransactionManager>().Cancel(); diff --git a/src/Orchard/Localization/Services/DefaultCultureManager.cs b/src/Orchard/Localization/Services/DefaultCultureManager.cs index ae77a121c..30e9b3a20 100644 --- a/src/Orchard/Localization/Services/DefaultCultureManager.cs +++ b/src/Orchard/Localization/Services/DefaultCultureManager.cs @@ -47,11 +47,8 @@ namespace Orchard.Localization.Services { return String.Empty; } - public int GetCultureIdByName(string cultureName) { - if (!IsValidCulture(cultureName)) { - throw new ArgumentException("cultureName"); - } - return _cultureRepository.Get(x => x.Culture == cultureName).Id; + public CultureRecord GetCultureById(int id) { + return _cultureRepository.Get(id); } // "<languagecode2>" or diff --git a/src/Orchard/Localization/Services/ICultureManager.cs b/src/Orchard/Localization/Services/ICultureManager.cs index 53c7d13af..a2864cd3c 100644 --- a/src/Orchard/Localization/Services/ICultureManager.cs +++ b/src/Orchard/Localization/Services/ICultureManager.cs @@ -1,11 +1,12 @@ using System.Collections.Generic; using System.Web; +using Orchard.Localization.Records; namespace Orchard.Localization.Services { public interface ICultureManager : IDependency { IEnumerable<string> ListCultures(); void AddCulture(string cultureName); string GetCurrentCulture(HttpContext requestContext); - int GetCultureIdByName(string cultureName); + CultureRecord GetCultureById(int id); } } From 6299ba764edff1707aea02dfe03a4bdf94499910 Mon Sep 17 00:00:00 2001 From: Louis DeJardin <Louis.DeJardin@microsoft.com> Date: Mon, 7 Jun 2010 16:02:54 -0700 Subject: [PATCH 50/66] Roughing out early support for common contents controller Listing and creating any defined content type Early stages - many features to be added - expect poor compatability with existing types and parts --HG-- branch : dev --- .../Parts/Common.Routable.ascx | 3 +- src/Orchard.Web/Core/Contents/AdminMenu.cs | 19 ++ .../Contents/Controllers/AdminController.cs | 166 ++++++++++++++++++ src/Orchard.Web/Core/Contents/Module.txt | 11 ++ .../ViewModels/ContentTypeListViewModel.cs | 10 ++ .../ViewModels/CreateItemViewModel.cs | 8 + .../Contents/ViewModels/EditItemViewModel.cs | 8 + .../ViewModels/ListContentViewModel.cs | 18 ++ .../Views/Admin/CreatableTypeList.aspx | 12 ++ .../Core/Contents/Views/Admin/Create.aspx | 8 + .../Core/Contents/Views/Admin/Edit.aspx | 8 + .../Core/Contents/Views/Admin/List.aspx | 33 ++++ .../Core/Contents/Views/Admin/Types.aspx | 24 +++ .../EditorTemplates/Items/Contents.Item.ascx | 14 ++ .../Core/Contents/Views/Web.config | 34 ++++ src/Orchard.Web/Core/Orchard.Core.csproj | 14 ++ .../Orchard.Setup/Services/SetupService.cs | 1 + 17 files changed, 390 insertions(+), 1 deletion(-) create mode 100644 src/Orchard.Web/Core/Contents/AdminMenu.cs create mode 100644 src/Orchard.Web/Core/Contents/Controllers/AdminController.cs create mode 100644 src/Orchard.Web/Core/Contents/Module.txt create mode 100644 src/Orchard.Web/Core/Contents/ViewModels/ContentTypeListViewModel.cs create mode 100644 src/Orchard.Web/Core/Contents/ViewModels/CreateItemViewModel.cs create mode 100644 src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs create mode 100644 src/Orchard.Web/Core/Contents/ViewModels/ListContentViewModel.cs create mode 100644 src/Orchard.Web/Core/Contents/Views/Admin/CreatableTypeList.aspx create mode 100644 src/Orchard.Web/Core/Contents/Views/Admin/Create.aspx create mode 100644 src/Orchard.Web/Core/Contents/Views/Admin/Edit.aspx create mode 100644 src/Orchard.Web/Core/Contents/Views/Admin/List.aspx create mode 100644 src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx create mode 100644 src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx create mode 100644 src/Orchard.Web/Core/Contents/Views/Web.config diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx index b699143bb..40ff7ecbc 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx @@ -24,7 +24,8 @@ url:"<%=Url.Slugify() %>", contentType:"<%=Model.RoutableAspect.ContentItem.ContentType %>", id:"<%=Model.RoutableAspect.ContentItem.Id %>"<% - var container = Model.RoutableAspect.ContentItem.As<ICommonAspect>().Container; + var commonAspect = Model.RoutableAspect.ContentItem.As<ICommonAspect>(); + var container = commonAspect != null ? commonAspect.Container : null; if (container != null) { %>, containerId:<%=container.ContentItem.Id %><% } %> diff --git a/src/Orchard.Web/Core/Contents/AdminMenu.cs b/src/Orchard.Web/Core/Contents/AdminMenu.cs new file mode 100644 index 000000000..9683a9478 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/AdminMenu.cs @@ -0,0 +1,19 @@ +using Orchard.Localization; +using Orchard.Security; +using Orchard.UI.Navigation; + +namespace Orchard.Core.Contents { + public class AdminMenu : INavigationProvider { + public Localizer T { get; set; } + public string MenuName { get { return "admin"; } } + + public void GetNavigation(NavigationBuilder builder) { + builder.Add(T("Content"), "1", + menu => { + menu.Add(T("Create"), "1.1", item => item.Action("Create", "Admin", new { area = "Contents" })); + menu.Add(T("List"), "1.2", item => item.Action("List", "Admin", new { area = "Contents" })); + menu.Add(T("Types"), "1.3", item => item.Action("Types", "Admin", new { area = "Contents" })); + }); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs new file mode 100644 index 000000000..245c99fcc --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -0,0 +1,166 @@ +using System; +using System.Linq; +using System.Web.Mvc; +using System.Web.Routing; +using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; +using Orchard.ContentManagement.Records; +using Orchard.Core.Contents.ViewModels; +using Orchard.Data; +using Orchard.Localization; +using Orchard.Logging; +using Orchard.Mvc.ViewModels; +using Orchard.UI.Notify; + +namespace Orchard.Core.Contents.Controllers { + [ValidateInput(false)] + public class AdminController : Controller, IUpdateModel { + private readonly INotifier _notifier; + private readonly IContentDefinitionManager _contentDefinitionManager; + private readonly IContentManager _contentManager; + private readonly ITransactionManager _transactionManager; + + public AdminController( + INotifier notifier, + IContentDefinitionManager contentDefinitionManager, + IContentManager contentManager, + ITransactionManager transactionManager) { + _notifier = notifier; + _contentDefinitionManager = contentDefinitionManager; + _contentManager = contentManager; + _transactionManager = transactionManager; + T = NullLocalizer.Instance; + Logger = NullLogger.Instance; + } + + public Localizer T { get; set; } + public ILogger Logger { get; set; } + + public ActionResult Index() { + return Types(); + } + + public ActionResult Types() { + return View("Types", new ContentTypeListViewModel { + Types = _contentDefinitionManager.ListTypeDefinitions() + }); + } + + public ActionResult List(ListContentViewModel model) { + const int pageSize = 20; + var skip = (Math.Max(model.Page ?? 0, 1) - 1) * pageSize; + + var query = _contentManager.Query(VersionOptions.Latest); + + if (!string.IsNullOrEmpty(model.Id)) { + query = query.ForType(model.Id); + } + + var contentItems = query.Slice(skip, pageSize); + + model.Entries = contentItems.Select(BuildEntry).ToList(); + + return View("List", model); + } + + private ListContentViewModel.Entry BuildEntry(ContentItem contentItem) { + var entry = new ListContentViewModel.Entry { + ContentItem = contentItem, + ContentItemMetadata = _contentManager.GetItemMetadata(contentItem), + ViewModel = _contentManager.BuildDisplayModel(contentItem, "List"), + }; + if (string.IsNullOrEmpty(entry.ContentItemMetadata.DisplayText)) { + entry.ContentItemMetadata.DisplayText = string.Format("[{0}#{1}]", contentItem.ContentType, contentItem.Id); + } + if (entry.ContentItemMetadata.EditorRouteValues == null) { + entry.ContentItemMetadata.EditorRouteValues = new RouteValueDictionary { + {"Area", "Contents"}, + {"Controller", "Admin"}, + {"Action", "Edit"}, + {"Id", contentItem.Id} + }; + } + return entry; + } + + ActionResult CreatableTypeList() { + var model = new ContentTypeListViewModel { + Types = _contentDefinitionManager.ListTypeDefinitions() + }; + + return View("CreatableTypeList", model); + } + + public ActionResult Create(string id) { + if (string.IsNullOrEmpty(id)) + return CreatableTypeList(); + + var contentItem = _contentManager.New(id); + var model = new CreateItemViewModel { + Id = id, + Content = _contentManager.BuildEditorModel(contentItem) + }; + PrepareEditorViewModel(model.Content); + return View("Create", model); + } + + + [HttpPost] + public ActionResult Create(CreateItemViewModel model) { + var contentItem = _contentManager.New(model.Id); + model.Content = _contentManager.UpdateEditorModel(contentItem, this); + if (ModelState.IsValid) { + _contentManager.Create(contentItem, VersionOptions.Draft); + model.Content = _contentManager.UpdateEditorModel(contentItem, this); + } + if (ModelState.IsValid) { + _contentManager.Publish(contentItem); + } + if (!ModelState.IsValid) { + _transactionManager.Cancel(); + PrepareEditorViewModel(model.Content); + return View("Create", model); + } + + _notifier.Information(T("Created content item")); + return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } }); + } + + public ActionResult Edit(int id) { + var contentItem = _contentManager.Get(id, VersionOptions.Latest); + var model = new EditItemViewModel { + Id = id, + Content = _contentManager.BuildEditorModel(contentItem) + }; + PrepareEditorViewModel(model.Content); + return View("Edit", model); + } + + [HttpPost] + public ActionResult Edit(EditItemViewModel model) { + var contentItem = _contentManager.Get(model.Id, VersionOptions.DraftRequired); + model.Content = _contentManager.UpdateEditorModel(contentItem, this); + if (!ModelState.IsValid) { + _transactionManager.Cancel(); + PrepareEditorViewModel(model.Content); + return View("Edit", model); + } + _contentManager.Publish(contentItem); + return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } }); + } + + private void PrepareEditorViewModel(ContentItemViewModel itemViewModel) { + if (string.IsNullOrEmpty(itemViewModel.TemplateName)) { + itemViewModel.TemplateName = "Items/Contents.Item"; + } + } + + bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) { + return TryUpdateModel(model, prefix, includeProperties, excludeProperties); + } + + void IUpdateModel.AddModelError(string key, LocalizedString errorMessage) { + ModelState.AddModelError(key, errorMessage); + } + } +} diff --git a/src/Orchard.Web/Core/Contents/Module.txt b/src/Orchard.Web/Core/Contents/Module.txt new file mode 100644 index 000000000..4933bb64d --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Module.txt @@ -0,0 +1,11 @@ +Name: Contents +antiforgery: enabled +author: The Orchard Team +website: http://orchardproject.net +version: 0.1 +orchardversion: 0.1.2010.0312 +description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. +features: + Contents: + Description: Default controllers for some content types. + Category: Core \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/ViewModels/ContentTypeListViewModel.cs b/src/Orchard.Web/Core/Contents/ViewModels/ContentTypeListViewModel.cs new file mode 100644 index 000000000..321e98365 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/ViewModels/ContentTypeListViewModel.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using Orchard.ContentManagement.MetaData.Models; +using Orchard.Mvc.ViewModels; + +namespace Orchard.Core.Contents.ViewModels { + public class ContentTypeListViewModel : BaseViewModel { + public IEnumerable<ContentTypeDefinition> Types { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/ViewModels/CreateItemViewModel.cs b/src/Orchard.Web/Core/Contents/ViewModels/CreateItemViewModel.cs new file mode 100644 index 000000000..b3636d9cb --- /dev/null +++ b/src/Orchard.Web/Core/Contents/ViewModels/CreateItemViewModel.cs @@ -0,0 +1,8 @@ +using Orchard.Mvc.ViewModels; + +namespace Orchard.Core.Contents.ViewModels { + public class CreateItemViewModel : BaseViewModel { + public string Id { get; set; } + public ContentItemViewModel Content { get; set; } + } +} diff --git a/src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs b/src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs new file mode 100644 index 000000000..93c44dfd8 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs @@ -0,0 +1,8 @@ +using Orchard.Mvc.ViewModels; + +namespace Orchard.Core.Contents.ViewModels { + public class EditItemViewModel : BaseViewModel { + public int Id { get; set; } + public ContentItemViewModel Content { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/ViewModels/ListContentViewModel.cs b/src/Orchard.Web/Core/Contents/ViewModels/ListContentViewModel.cs new file mode 100644 index 000000000..36b8cb39a --- /dev/null +++ b/src/Orchard.Web/Core/Contents/ViewModels/ListContentViewModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using Orchard.ContentManagement; +using Orchard.Mvc.ViewModels; + +namespace Orchard.Core.Contents.ViewModels { + public class ListContentViewModel : BaseViewModel { + public string Id { get; set; } + public int? Page { get; set; } + public IList<Entry> Entries { get; set; } + + public class Entry { + public ContentItem ContentItem { get; set; } + public ContentItemMetadata ContentItemMetadata { get; set; } + public ContentItemViewModel ViewModel { get; set; } + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/CreatableTypeList.aspx b/src/Orchard.Web/Core/Contents/Views/Admin/CreatableTypeList.aspx new file mode 100644 index 000000000..f0859f699 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Admin/CreatableTypeList.aspx @@ -0,0 +1,12 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ContentTypeListViewModel>" %> + +<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %> +<% Html.AddTitleParts(T("Create Content").ToString()); %> +<p> + Create content</p> +<ul> + <% foreach (var t in Model.Types) {%> + <li> + <%:Html.ActionLink(t.Name, "Create", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}) %></li> + <%} %> +</ul> diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Create.aspx b/src/Orchard.Web/Core/Contents/Views/Admin/Create.aspx new file mode 100644 index 000000000..75a52c8c8 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Admin/Create.aspx @@ -0,0 +1,8 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<CreateItemViewModel>" %> + +<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %> +<% Html.AddTitleParts(T("Create Content").ToString()); %> +<% using (Html.BeginFormAntiForgeryPost()) { %> +<%:Html.ValidationSummary() %> +<%:Html.EditorForItem(m=>m.Content) %> +<%} %> diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Edit.aspx b/src/Orchard.Web/Core/Contents/Views/Admin/Edit.aspx new file mode 100644 index 000000000..e6edeec39 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Admin/Edit.aspx @@ -0,0 +1,8 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<EditItemViewModel>" %> + +<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %> +<% Html.AddTitleParts(T("Edit Content").ToString()); %> +<% using (Html.BeginFormAntiForgeryPost()) { %> +<%:Html.ValidationSummary() %> +<%:Html.EditorForItem(m=>m.Content) %> +<%} %> diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/List.aspx b/src/Orchard.Web/Core/Contents/Views/Admin/List.aspx new file mode 100644 index 000000000..6921ed2f8 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Admin/List.aspx @@ -0,0 +1,33 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ListContentViewModel>" %> + +<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %> +<% Html.AddTitleParts(T("Browse Contents").ToString()); %> +<p> + Browse Contents</p> +<table> + <% foreach (var t in Model.Entries) {%> + <tr> + <td> + <%:t.ContentItem.Id %>. + </td> + <td> + <%:t.ContentItem.ContentType %> + </td> + <td> + ver #<%:t.ContentItem.Version %> + </td> + <td> + <%if (t.ContentItemMetadata.DisplayRouteValues != null) {%> + <%:Html.ActionLink(t.ContentItemMetadata.DisplayText, t.ContentItemMetadata.DisplayRouteValues["Action"].ToString(), t.ContentItemMetadata.DisplayRouteValues)%> + <%}%> + </td> + <td> + <%if (t.ContentItemMetadata.EditorRouteValues != null) {%> + <%:Html.ActionLink("edit", t.ContentItemMetadata.EditorRouteValues["Action"].ToString(), t.ContentItemMetadata.EditorRouteValues)%> + <%}%> + </td> + </tr> + <%} %> +</table> +<p> + <%:Html.ActionLink("Create new item", "Create", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",Model.Id}}, new Dictionary<string, object>()) %></p> diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx b/src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx new file mode 100644 index 000000000..52464d493 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx @@ -0,0 +1,24 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ContentTypeListViewModel>" %> + +<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %> +<% Html.AddTitleParts(T("Create Content").ToString()); %> +<p> + Create content</p> +<table> + <% foreach (var t in Model.Types) {%> + <tr> + <td> + <%:t.Name %> + </td> + <td> + <%:Html.ActionLink(T("List Items"), "List", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}, new Dictionary<string, object>()) %> + </td> + <td> + <%:Html.ActionLink(T("Create Item"), "Create", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}, new Dictionary<string, object>()) %> + </td> + <td> + <%:Html.ActionLink(T("Edit Type"), "ContentTypeList", "Admin", new RouteValueDictionary{{"Area","Orchard.MetaData"},{"Id",t.Name}}, new Dictionary<string, object>()) %> + </td> + </tr> + <%} %> +</table> diff --git a/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx new file mode 100644 index 000000000..5e0cc4986 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx @@ -0,0 +1,14 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +<div class="sections"> + <div class="primary"><% + Html.Zone("primary"); + Html.ZonesExcept("secondary"); %> + </div> + <div class="secondary"> + <% Html.Zone("secondary");%> + <fieldset> + <input class="button primaryAction" type="submit" name="submit.Save" value="<%=_Encoded("Save") %>"/> + </fieldset> + </div> +</div> \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Web.config b/src/Orchard.Web/Core/Contents/Views/Web.config new file mode 100644 index 000000000..e065d8735 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Web.config @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<configuration> + <system.web> + <httpHandlers> + <add path="*" verb="*" + type="System.Web.HttpNotFoundHandler"/> + </httpHandlers> + + <!-- + Enabling request validation in view pages would cause validation to occur + after the input has already been processed by the controller. By default + MVC performs request validation before a controller processes the input. + To change this behavior apply the ValidateInputAttribute to a + controller or action. + --> + <pages + validateRequest="false" + pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> + <controls> + <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" /> + </controls> + </pages> + </system.web> + + <system.webServer> + <validation validateIntegratedModeConfiguration="false"/> + <handlers> + <remove name="BlockViewHandler"/> + <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/> + </handlers> + </system.webServer> +</configuration> diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index b29aa2515..79cf03728 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -86,6 +86,12 @@ <Compile Include="Common\ViewModels\BodyEditorViewModel.cs" /> <Compile Include="Common\ViewModels\RoutableEditorViewModel.cs" /> <Compile Include="Common\ViewModels\OwnerEditorViewModel.cs" /> + <Compile Include="Contents\AdminMenu.cs" /> + <Compile Include="Contents\Controllers\AdminController.cs" /> + <Compile Include="Contents\ViewModels\CreateItemViewModel.cs" /> + <Compile Include="Contents\ViewModels\ContentTypeListViewModel.cs" /> + <Compile Include="Contents\ViewModels\EditItemViewModel.cs" /> + <Compile Include="Contents\ViewModels\ListContentViewModel.cs" /> <Compile Include="Dashboard\AdminMenu.cs" /> <Compile Include="Dashboard\Controllers\AdminController.cs" /> <Compile Include="Dashboard\Routes.cs" /> @@ -179,6 +185,13 @@ </ItemGroup> <ItemGroup> <Content Include="Common\Module.txt" /> + <Content Include="Contents\Module.txt" /> + <Content Include="Contents\Views\Admin\Types.aspx" /> + <Content Include="Contents\Views\Admin\List.aspx" /> + <Content Include="Contents\Views\Admin\Edit.aspx" /> + <Content Include="Contents\Views\Admin\CreatableTypeList.aspx" /> + <Content Include="Contents\Views\Admin\Create.aspx" /> + <Content Include="Contents\Views\EditorTemplates\Items\Contents.Item.ascx" /> <Content Include="Indexing\Module.txt" /> <Content Include="Settings\Module.txt" /> <Content Include="Settings\Views\Admin\Index.ascx" /> @@ -231,6 +244,7 @@ <ItemGroup> <None Include="App_Data\Localization\en-US\orchard.core.po" /> <None Include="App_Data\Localization\fr-FR\orchard.core.po" /> + <Content Include="Contents\Views\Web.config" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index 49cbb27d4..350218344 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -57,6 +57,7 @@ namespace Orchard.Setup.Services { string[] hardcoded = { "Orchard.Framework", "Common", + "Contents", "Dashboard", "Feeds", "HomePage", From ccc86d164a59e73223bec3162279c4816d415124 Mon Sep 17 00:00:00 2001 From: Louis DeJardin <Louis.DeJardin@microsoft.com> Date: Mon, 7 Jun 2010 16:07:57 -0700 Subject: [PATCH 51/66] Adding some .ToString() conversions where localized strings are being used --HG-- branch : dev --- .../Core/Contents/Controllers/AdminController.cs | 2 +- src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs index 245c99fcc..7667980f8 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -160,7 +160,7 @@ namespace Orchard.Core.Contents.Controllers { } void IUpdateModel.AddModelError(string key, LocalizedString errorMessage) { - ModelState.AddModelError(key, errorMessage); + ModelState.AddModelError(key, errorMessage.ToString()); } } } diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx b/src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx index 52464d493..51b90a383 100644 --- a/src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx +++ b/src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx @@ -11,13 +11,13 @@ <%:t.Name %> </td> <td> - <%:Html.ActionLink(T("List Items"), "List", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}, new Dictionary<string, object>()) %> + <%:Html.ActionLink(T("List Items").ToString(), "List", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}, new Dictionary<string, object>()) %> </td> <td> - <%:Html.ActionLink(T("Create Item"), "Create", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}, new Dictionary<string, object>()) %> + <%:Html.ActionLink(T("Create Item").ToString(), "Create", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}, new Dictionary<string, object>()) %> </td> <td> - <%:Html.ActionLink(T("Edit Type"), "ContentTypeList", "Admin", new RouteValueDictionary{{"Area","Orchard.MetaData"},{"Id",t.Name}}, new Dictionary<string, object>()) %> + <%:Html.ActionLink(T("Edit Type").ToString(), "ContentTypeList", "Admin", new RouteValueDictionary{{"Area","Orchard.MetaData"},{"Id",t.Name}}, new Dictionary<string, object>()) %> </td> </tr> <%} %> From abf8357f1b75e91645b6c439b871d7e3df1bd55a Mon Sep 17 00:00:00 2001 From: Louis DeJardin <Louis.DeJardin@microsoft.com> Date: Tue, 8 Jun 2010 10:50:08 -0700 Subject: [PATCH 52/66] Starting point of standard content/routable controllers Contents/Item/Display/{Id} to show published Contents/Item/Preview/{Id} to show latest (draft or published) Contents/Item/Preview/{Id}?Version= to particular numbered version {*Path} in Routable/ItemController.Display to show published where {Path}=RoutableRecord.Path --HG-- branch : dev --- .../Core/Common/Models/RoutableAspect.cs | 5 +- .../Core/Common/Models/RoutableRecord.cs | 8 ++- .../Contents/Controllers/ItemController.cs | 49 +++++++++++++ .../Handlers/ContentsModuleHandler.cs | 29 ++++++++ .../Contents/ViewModels/EditItemViewModel.cs | 3 + .../DisplayTemplates/Items/Contents.Item.ascx | 11 +++ .../Core/Contents/Views/Item/Display.aspx | 5 ++ .../Core/Contents/Views/Item/Preview.aspx | 3 + src/Orchard.Web/Core/Orchard.Core.csproj | 17 +++++ .../Routable/Controllers/ItemController.cs | 44 ++++++++++++ .../Core/Routable/Drivers/RoutableDriver.cs | 60 ++++++++++++++++ .../Core/Routable/Handlers/RoutableHandler.cs | 20 ++++++ .../Core/Routable/IRoutablePathConstraint.cs | 11 +++ .../Core/Routable/Models/IsRoutable.cs | 18 +++++ src/Orchard.Web/Core/Routable/Module.txt | 11 +++ src/Orchard.Web/Core/Routable/Routes.cs | 42 ++++++++++++ .../Services/RoutablePathConstraint.cs | 68 +++++++++++++++++++ .../Services/RoutablePathConstraintUpdator.cs | 36 ++++++++++ .../ViewModels/RoutableDisplayViewModel.cs | 8 +++ .../Core/Routable/Views/Item/Display.aspx | 3 + .../Core/Routable/Views/Web.config | 34 ++++++++++ .../Aspects/IRoutableAspect.cs | 6 ++ .../Mvc/ViewEngines/ViewEngineFilter.cs | 4 +- src/Orchard/Orchard.Framework.csproj | 1 + 24 files changed, 490 insertions(+), 6 deletions(-) create mode 100644 src/Orchard.Web/Core/Contents/Controllers/ItemController.cs create mode 100644 src/Orchard.Web/Core/Contents/Handlers/ContentsModuleHandler.cs create mode 100644 src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.ascx create mode 100644 src/Orchard.Web/Core/Contents/Views/Item/Display.aspx create mode 100644 src/Orchard.Web/Core/Contents/Views/Item/Preview.aspx create mode 100644 src/Orchard.Web/Core/Routable/Controllers/ItemController.cs create mode 100644 src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs create mode 100644 src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs create mode 100644 src/Orchard.Web/Core/Routable/IRoutablePathConstraint.cs create mode 100644 src/Orchard.Web/Core/Routable/Models/IsRoutable.cs create mode 100644 src/Orchard.Web/Core/Routable/Module.txt create mode 100644 src/Orchard.Web/Core/Routable/Routes.cs create mode 100644 src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs create mode 100644 src/Orchard.Web/Core/Routable/Services/RoutablePathConstraintUpdator.cs create mode 100644 src/Orchard.Web/Core/Routable/ViewModels/RoutableDisplayViewModel.cs create mode 100644 src/Orchard.Web/Core/Routable/Views/Item/Display.aspx create mode 100644 src/Orchard.Web/Core/Routable/Views/Web.config create mode 100644 src/Orchard/ContentManagement/Aspects/IRoutableAspect.cs diff --git a/src/Orchard.Web/Core/Common/Models/RoutableAspect.cs b/src/Orchard.Web/Core/Common/Models/RoutableAspect.cs index 1253f05d2..45fe93890 100644 --- a/src/Orchard.Web/Core/Common/Models/RoutableAspect.cs +++ b/src/Orchard.Web/Core/Common/Models/RoutableAspect.cs @@ -1,7 +1,8 @@ using Orchard.ContentManagement; +using Orchard.ContentManagement.Aspects; namespace Orchard.Core.Common.Models { - public class RoutableAspect : ContentPart<RoutableRecord> { + public class RoutableAspect : ContentPart<RoutableRecord>, IRoutableAspect { public string ContentItemBasePath { get; set; } public string Title { @@ -14,4 +15,4 @@ namespace Orchard.Core.Common.Models { set { Record.Slug = value; } } } -} \ No newline at end of file +} diff --git a/src/Orchard.Web/Core/Common/Models/RoutableRecord.cs b/src/Orchard.Web/Core/Common/Models/RoutableRecord.cs index 9951a8b24..ea142a302 100644 --- a/src/Orchard.Web/Core/Common/Models/RoutableRecord.cs +++ b/src/Orchard.Web/Core/Common/Models/RoutableRecord.cs @@ -1,4 +1,5 @@ -using System.ComponentModel.DataAnnotations; +using System; +using System.ComponentModel.DataAnnotations; using Orchard.ContentManagement.Records; namespace Orchard.Core.Common.Models { @@ -7,5 +8,8 @@ namespace Orchard.Core.Common.Models { public virtual string Title { get; set; } public virtual string Slug { get; set; } + + [StringLength(2048)] + public virtual string Path { get; set; } } -} \ No newline at end of file +} diff --git a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs new file mode 100644 index 000000000..2a87f89f9 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using Orchard.ContentManagement; +using Orchard.Core.Contents.ViewModels; +using Orchard.Mvc.ViewModels; + +namespace Orchard.Core.Contents.Controllers { + public class ItemController : Controller { + private readonly IContentManager _contentManager; + + public ItemController(IContentManager contentManager) { + _contentManager = contentManager; + } + + public ActionResult Display(int id) { + var contentItem = _contentManager.Get(id, VersionOptions.Published); + + var model = new DisplayItemViewModel { + Content = _contentManager.BuildDisplayModel(contentItem, "Detail") + }; + PrepareDisplayViewModel(model.Content); + return View("Display", model); + } + + public ActionResult Preview(int id, int? version) { + var versionOptions = VersionOptions.Latest; + if (version != null) { + versionOptions = VersionOptions.Number((int)version); + } + + var contentItem = _contentManager.Get(id, versionOptions); + + var model = new DisplayItemViewModel { + Content = _contentManager.BuildDisplayModel(contentItem, "Detail") + }; + PrepareDisplayViewModel(model.Content); + return View("Preview", model); + } + + private static void PrepareDisplayViewModel(ContentItemViewModel itemViewModel) { + if (string.IsNullOrEmpty(itemViewModel.TemplateName)) { + itemViewModel.TemplateName = "Items/Contents.Item"; + } + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Handlers/ContentsModuleHandler.cs b/src/Orchard.Web/Core/Contents/Handlers/ContentsModuleHandler.cs new file mode 100644 index 000000000..9abef1511 --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Handlers/ContentsModuleHandler.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Routing; +using Orchard.ContentManagement.Handlers; + +namespace Orchard.Core.Contents.Handlers { + public class ContentsModuleHandler : ContentHandlerBase { + public override void GetContentItemMetadata(GetContentItemMetadataContext context) { + if (context.Metadata.EditorRouteValues == null) { + context.Metadata.EditorRouteValues = new RouteValueDictionary { + {"Area", "Contents"}, + {"Controller", "Admin"}, + {"Action", "Edit"}, + {"Id", context.ContentItem.Id} + }; + } + if (context.Metadata.DisplayRouteValues == null) { + context.Metadata.DisplayRouteValues = new RouteValueDictionary { + {"Area", "Contents"}, + {"Controller", "Item"}, + {"Action", "Display"}, + {"Id", context.ContentItem.Id} + }; + } + } + } +} diff --git a/src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs b/src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs index 93c44dfd8..908b201e0 100644 --- a/src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs +++ b/src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs @@ -5,4 +5,7 @@ namespace Orchard.Core.Contents.ViewModels { public int Id { get; set; } public ContentItemViewModel Content { get; set; } } + public class DisplayItemViewModel : BaseViewModel { + public ContentItemViewModel Content { get; set; } + } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.ascx b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.ascx new file mode 100644 index 000000000..072cecebe --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.ascx @@ -0,0 +1,11 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels" %> +<%@ Import Namespace="Orchard.ContentManagement.Aspects" %> +<%@ Import Namespace="Orchard.ContentManagement" %> +<%var routable = Model.Item.As<IRoutableAspect>(); + if (routable != null && !string.IsNullOrEmpty(routable.Title)) {%> +<h1> + <%:routable.Title%></h1> +<%} %> +<% Html.Zone("primary", ":manage :metadata"); + Html.ZonesAny(); %> diff --git a/src/Orchard.Web/Core/Contents/Views/Item/Display.aspx b/src/Orchard.Web/Core/Contents/Views/Item/Display.aspx new file mode 100644 index 000000000..2eb28576d --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Item/Display.aspx @@ -0,0 +1,5 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<Orchard.Core.Contents.ViewModels.DisplayItemViewModel>" %> + +<div class="preview"> + <%=Html.DisplayForItem(m=>m.Content) %> +</div> diff --git a/src/Orchard.Web/Core/Contents/Views/Item/Preview.aspx b/src/Orchard.Web/Core/Contents/Views/Item/Preview.aspx new file mode 100644 index 000000000..9bb5300af --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Item/Preview.aspx @@ -0,0 +1,3 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<Orchard.Core.Contents.ViewModels.DisplayItemViewModel>" %> + +<%=Html.DisplayForItem(m=>m.Content) %> diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 62ad375e2..4b9aad157 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -68,6 +68,13 @@ <Compile Include="Common\Drivers\RoutableDriver.cs" /> <Compile Include="Common\Controllers\RoutableController.cs" /> <Compile Include="Common\Handlers\RoutableAspectHandler.cs" /> + <Compile Include="Contents\Controllers\ItemController.cs" /> + <Compile Include="Contents\Handlers\ContentsModuleHandler.cs" /> + <Compile Include="Routable\Controllers\ItemController.cs" /> + <Compile Include="Routable\Drivers\RoutableDriver.cs" /> + <Compile Include="Routable\Handlers\RoutableHandler.cs" /> + <Compile Include="Routable\IRoutablePathConstraint.cs" /> + <Compile Include="Routable\Models\IsRoutable.cs" /> <Compile Include="Common\Permissions.cs" /> <Compile Include="Common\Models\CommonVersionRecord.cs" /> <Compile Include="Common\Routes.cs" /> @@ -145,6 +152,10 @@ <Compile Include="Navigation\ViewModels\MenuItemEntry.cs" /> <Compile Include="Navigation\ViewModels\NavigationManagementViewModel.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Routable\Routes.cs" /> + <Compile Include="Routable\Services\RoutablePathConstraint.cs" /> + <Compile Include="Routable\Services\RoutablePathConstraintUpdator.cs" /> + <Compile Include="Routable\ViewModels\RoutableDisplayViewModel.cs" /> <Compile Include="Scheduling\Models\ScheduledTaskRecord.cs" /> <Compile Include="Scheduling\Services\PublishingTaskHandler.cs" /> <Compile Include="Scheduling\Services\PublishingTaskManager.cs" /> @@ -194,9 +205,14 @@ <Content Include="Contents\Views\Admin\Edit.aspx" /> <Content Include="Contents\Views\Admin\CreatableTypeList.aspx" /> <Content Include="Contents\Views\Admin\Create.aspx" /> + <Content Include="Contents\Views\DisplayTemplates\Items\Contents.Item.ascx" /> <Content Include="Contents\Views\EditorTemplates\Items\Contents.Item.ascx" /> + <Content Include="Contents\Views\Item\Preview.aspx" /> + <Content Include="Contents\Views\Item\Display.aspx" /> <Content Include="Indexing\Module.txt" /> <Content Include="Localization\Module.txt" /> + <Content Include="Routable\Module.txt" /> + <Content Include="Routable\Views\Item\Display.aspx" /> <Content Include="Settings\Module.txt" /> <Content Include="Settings\Views\Admin\Index.ascx" /> <Content Include="Web.config" /> @@ -249,6 +265,7 @@ <None Include="App_Data\Localization\en-US\orchard.core.po" /> <None Include="App_Data\Localization\fr-FR\orchard.core.po" /> <Content Include="Contents\Views\Web.config" /> + <Content Include="Routable\Views\Web.config" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> diff --git a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs new file mode 100644 index 000000000..1c9c2ba5b --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs @@ -0,0 +1,44 @@ +using System; +using System.Linq; +using System.Web.Mvc; +using Orchard.ContentManagement; +using Orchard.ContentManagement.Aspects; +using Orchard.Core.Common.Models; +using Orchard.Core.Routable.Models; +using Orchard.Core.Routable.ViewModels; +using Orchard.Mvc.ViewModels; + +namespace Orchard.Core.Routable.Controllers { + [ValidateInput(false)] + public class ItemController : Controller { + private readonly IContentManager _contentManager; + + public ItemController(IContentManager contentManager) { + _contentManager = contentManager; + } + + public ActionResult Display(string path) { + var hits = _contentManager + .Query<IsRoutable, RoutableRecord>(VersionOptions.Published) + .Where(r => r.Path == path) + .Slice(0, 2); + if (hits.Count() == 0) { + throw new ApplicationException("404 - should not have passed path constraint"); + } + if (hits.Count() != 1) { + throw new ApplicationException("Ambiguous content"); + } + var model = new RoutableDisplayViewModel { + Routable = _contentManager.BuildDisplayModel<IRoutableAspect>(hits.Single(), "Detail") + }; + PrepareDisplayViewModel(model.Routable); + return View("Display", model); + } + + private void PrepareDisplayViewModel(ContentItemViewModel<IRoutableAspect> itemViewModel) { + if (string.IsNullOrEmpty(itemViewModel.TemplateName)) { + itemViewModel.TemplateName = "Items/Contents.Item"; + } + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs new file mode 100644 index 000000000..60efef1ff --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs @@ -0,0 +1,60 @@ +using JetBrains.Annotations; +using Orchard.ContentManagement; +using Orchard.ContentManagement.Drivers; +using Orchard.Core.Common.Models; +using Orchard.Core.Common.ViewModels; +using Orchard.Core.Common.Services; +using Orchard.Core.Routable.Models; +using Orchard.Localization; +using Orchard.UI.Notify; + +namespace Orchard.Core.Routable.Drivers { + public class RoutableDriver : ContentPartDriver<IsRoutable> { + protected override DriverResult Editor(IsRoutable part, IUpdateModel updater) { + part.Record.Title = "Routable #" + part.ContentItem.Id; + part.Record.Slug = "routable" + part.ContentItem.Id; + part.Record.Path = "routable" + part.ContentItem.Id; + return base.Editor(part, updater); + } + //private const string TemplateName = "Parts/Common.Routable"; + + //private readonly IOrchardServices _services; + //private readonly IRoutableService _routableService; + //public Localizer T { get; set; } + + //protected override string Prefix { + // get { return "Routable"; } + //} + + //public Routable(IOrchardServices services, IRoutableService routableService) + //{ + // _services = services; + // _routableService = routableService; + + // T = NullLocalizer.Instance; + //} + + //protected override DriverResult Editor(RoutableAspect part) { + // var model = new RoutableEditorViewModel { Prefix = Prefix, RoutableAspect = part }; + // return ContentPartTemplate(model, TemplateName, Prefix).Location("primary", "before.5"); + //} + + //protected override DriverResult Editor(RoutableAspect part, IUpdateModel updater) { + // var model = new RoutableEditorViewModel { Prefix = Prefix, RoutableAspect = part }; + // updater.TryUpdateModel(model, Prefix, null, null); + + // if (!_routableService.IsSlugValid(part.Slug)){ + // updater.AddModelError("Routable.Slug", T("Please do not use any of the following characters in your slugs: \"/\", \":\", \"?\", \"#\", \"[\", \"]\", \"@\", \"!\", \"$\", \"&\", \"'\", \"(\", \")\", \"*\", \"+\", \",\", \";\", \"=\". No spaces are allowed (please use dashes or underscores instead).").ToString()); + // } + + // string originalSlug = part.Slug; + // if(!_routableService.ProcessSlug(part)) { + // _services.Notifier.Warning(T("Slugs in conflict. \"{0}\" is already set for a previously created {2} so now it has the slug \"{1}\"", + // originalSlug, part.Slug, part.ContentItem.ContentType)); + // } + + // return ContentPartTemplate(model, TemplateName, Prefix).Location("primary", "before.5"); + //} + + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs b/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs new file mode 100644 index 000000000..f83864661 --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Handlers/RoutableHandler.cs @@ -0,0 +1,20 @@ +using System.Web.Routing; +using Orchard.ContentManagement; +using Orchard.ContentManagement.Handlers; +using Orchard.Core.Routable.Models; + +namespace Orchard.Core.Routable.Handlers { + public class RoutableHandler : ContentHandlerBase { + public override void GetContentItemMetadata(GetContentItemMetadataContext context) { + var routable = context.ContentItem.As<IsRoutable>(); + if (routable != null) { + context.Metadata.DisplayRouteValues = new RouteValueDictionary { + {"Area", "Routable"}, + {"Controller", "Item"}, + {"Action", "Display"}, + {"Path", context.ContentItem.As<IsRoutable>().Record.Path} + }; + } + } + } +} diff --git a/src/Orchard.Web/Core/Routable/IRoutablePathConstraint.cs b/src/Orchard.Web/Core/Routable/IRoutablePathConstraint.cs new file mode 100644 index 000000000..63f5d9a85 --- /dev/null +++ b/src/Orchard.Web/Core/Routable/IRoutablePathConstraint.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; +using System.Web.Routing; + +namespace Orchard.Core.Routable { + public interface IRoutablePathConstraint : IRouteConstraint, ISingletonDependency { + void SetSlugs(IEnumerable<string> slugs); + string FindSlug(string slug); + void AddSlug(string slug); + void RemoveSlug(string slug); + } +} diff --git a/src/Orchard.Web/Core/Routable/Models/IsRoutable.cs b/src/Orchard.Web/Core/Routable/Models/IsRoutable.cs new file mode 100644 index 000000000..bf877799a --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Models/IsRoutable.cs @@ -0,0 +1,18 @@ +using Orchard.ContentManagement; +using Orchard.ContentManagement.Aspects; +using Orchard.Core.Common.Models; + +namespace Orchard.Core.Routable.Models { + public class IsRoutable : ContentPart<RoutableRecord>, IRoutableAspect { + public string Title { + get { return Record.Title; } + set { Record.Title = value; } + } + + public string Slug { + get { return Record.Slug; } + set { Record.Slug = value; } + } + + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Routable/Module.txt b/src/Orchard.Web/Core/Routable/Module.txt new file mode 100644 index 000000000..4cd6d7542 --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Module.txt @@ -0,0 +1,11 @@ +Name: Routable +antiforgery: enabled +author: The Orchard Team +website: http://orchardproject.net +version: 0.1 +orchardversion: 0.1.2010.0312 +description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. +features: + Routable: + Description: Routable content part. + Category: Core2 diff --git a/src/Orchard.Web/Core/Routable/Routes.cs b/src/Orchard.Web/Core/Routable/Routes.cs new file mode 100644 index 000000000..ba858b27c --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Routes.cs @@ -0,0 +1,42 @@ +using System.Collections.Generic; +using System.Web.Mvc; +using System.Web.Routing; +using Orchard.Mvc.Routes; + +namespace Orchard.Core.Routable { + public class Routes : IRouteProvider { + private readonly IRoutablePathConstraint _routablePathConstraint; + + public Routes(IRoutablePathConstraint routablePathConstraint) { + _routablePathConstraint = routablePathConstraint; + } + + public void GetRoutes(ICollection<RouteDescriptor> routes) { + foreach (var routeDescriptor in GetRoutes()) + routes.Add(routeDescriptor); + } + + public IEnumerable<RouteDescriptor> GetRoutes() { + return new[] { + new RouteDescriptor { + Priority = 10, + Route = new Route( + "{*path}", + new RouteValueDictionary { + {"area", "Routable"}, + {"controller", "Item"}, + {"action", "Display"} + }, + new RouteValueDictionary { + {"path", _routablePathConstraint} + }, + new RouteValueDictionary { + {"area", "Routable"} + }, + new MvcRouteHandler()) + } + }; + } + + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs new file mode 100644 index 000000000..afda64234 --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Routing; +using JetBrains.Annotations; +using Orchard.Logging; + +namespace Orchard.Core.Routable.Services { + [UsedImplicitly] + public class RoutablePathConstraint : IRoutablePathConstraint { + /// <summary> + /// Singleton object, per Orchard Shell instance. We need to protect concurrent access to the dictionary. + /// </summary> + private readonly object _syncLock = new object(); + private IDictionary<string, string> _slugs = new Dictionary<string, string>(); + + public RoutablePathConstraint() { + Logger = NullLogger.Instance; + } + + public ILogger Logger { get; set; } + + public void SetSlugs(IEnumerable<string> slugs) { + // Make a copy to avoid performing potential lazy computation inside the lock + var slugsArray = slugs.ToArray(); + + lock (_syncLock) { + _slugs = slugsArray.Distinct(StringComparer.OrdinalIgnoreCase).ToDictionary(value => value, StringComparer.OrdinalIgnoreCase); + } + } + + public string FindSlug(string slug) { + lock (_syncLock) { + string actual; + return _slugs.TryGetValue(slug, out actual) ? actual : slug; + } + } + + public void AddSlug(string slug) { + lock (_syncLock) { + _slugs[slug] = slug; + } + } + + public void RemoveSlug(string slug) { + lock (_syncLock) { + _slugs.Remove(slug); + } + } + + public bool Match(HttpContextBase httpContext, Route route, string parameterName, RouteValueDictionary values, RouteDirection routeDirection) { + if (routeDirection == RouteDirection.UrlGeneration) + return true; + + object value; + if (values.TryGetValue(parameterName, out value)) { + var parameterValue = Convert.ToString(value); + + lock (_syncLock) { + return _slugs.ContainsKey(parameterValue); + } + } + + return false; + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraintUpdator.cs b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraintUpdator.cs new file mode 100644 index 000000000..f2902e0aa --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraintUpdator.cs @@ -0,0 +1,36 @@ +using System.Linq; +using JetBrains.Annotations; +using Orchard.Core.Common.Models; +using Orchard.Data; +using Orchard.Environment; +using Orchard.Tasks; + +namespace Orchard.Core.Routable.Services { + [UsedImplicitly] + public class RoutablePathConstraintUpdator : IOrchardShellEvents, IBackgroundTask { + private readonly IRoutablePathConstraint _pageSlugConstraint; + private readonly IRepository<RoutableRecord> _repository; + + public RoutablePathConstraintUpdator(IRoutablePathConstraint pageSlugConstraint, IRepository<RoutableRecord> repository) { + _pageSlugConstraint = pageSlugConstraint; + _repository = repository; + } + + void IOrchardShellEvents.Activated() { + Refresh(); + } + + void IOrchardShellEvents.Terminating() { + } + + void IBackgroundTask.Sweep() { + Refresh(); + } + + private void Refresh() { + var slugs = _repository.Fetch(r => r.ContentItemVersionRecord.Published && r.Path != "" && r.Path != null).Select(r => r.Path); + + _pageSlugConstraint.SetSlugs(slugs); + } + } +} diff --git a/src/Orchard.Web/Core/Routable/ViewModels/RoutableDisplayViewModel.cs b/src/Orchard.Web/Core/Routable/ViewModels/RoutableDisplayViewModel.cs new file mode 100644 index 000000000..e07d266f5 --- /dev/null +++ b/src/Orchard.Web/Core/Routable/ViewModels/RoutableDisplayViewModel.cs @@ -0,0 +1,8 @@ +using Orchard.ContentManagement.Aspects; +using Orchard.Mvc.ViewModels; + +namespace Orchard.Core.Routable.ViewModels { + public class RoutableDisplayViewModel : BaseViewModel { + public ContentItemViewModel<IRoutableAspect> Routable {get;set;} + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Routable/Views/Item/Display.aspx b/src/Orchard.Web/Core/Routable/Views/Item/Display.aspx new file mode 100644 index 000000000..c4878ad6d --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Views/Item/Display.aspx @@ -0,0 +1,3 @@ +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<Orchard.Core.Routable.ViewModels.RoutableDisplayViewModel>" %> +<% Html.AddTitleParts(Model.Routable.Item.Title); %> +<%=Html.DisplayForItem(m=>m.Routable) %> diff --git a/src/Orchard.Web/Core/Routable/Views/Web.config b/src/Orchard.Web/Core/Routable/Views/Web.config new file mode 100644 index 000000000..e065d8735 --- /dev/null +++ b/src/Orchard.Web/Core/Routable/Views/Web.config @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<configuration> + <system.web> + <httpHandlers> + <add path="*" verb="*" + type="System.Web.HttpNotFoundHandler"/> + </httpHandlers> + + <!-- + Enabling request validation in view pages would cause validation to occur + after the input has already been processed by the controller. By default + MVC performs request validation before a controller processes the input. + To change this behavior apply the ValidateInputAttribute to a + controller or action. + --> + <pages + validateRequest="false" + pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> + <controls> + <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" /> + </controls> + </pages> + </system.web> + + <system.webServer> + <validation validateIntegratedModeConfiguration="false"/> + <handlers> + <remove name="BlockViewHandler"/> + <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/> + </handlers> + </system.webServer> +</configuration> diff --git a/src/Orchard/ContentManagement/Aspects/IRoutableAspect.cs b/src/Orchard/ContentManagement/Aspects/IRoutableAspect.cs new file mode 100644 index 000000000..0943b76ce --- /dev/null +++ b/src/Orchard/ContentManagement/Aspects/IRoutableAspect.cs @@ -0,0 +1,6 @@ +namespace Orchard.ContentManagement.Aspects { + public interface IRoutableAspect : IContent { + string Title { get; set; } + string Slug { get; set; } + } +} diff --git a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs index a2345afaa..832eec526 100644 --- a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs +++ b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs @@ -48,7 +48,7 @@ namespace Orchard.Mvc.ViewEngines { themeViewEngines = _viewEngineProviders .Select(x => x.CreateThemeViewEngine(new CreateThemeViewEngineParams { VirtualPath = themeLocation })); - Logger.Debug("Theme location:\r\n\t-{0}", themeLocation); + //Logger.Debug("Theme location:\r\n\t-{0}", themeLocation); } @@ -58,7 +58,7 @@ namespace Orchard.Mvc.ViewEngines { var moduleLocations = modules.Select(x => Path.Combine(x.Location, x.Name)); var moduleViewEngines = _viewEngineProviders .Select(x => x.CreateModulesViewEngine(new CreateModulesViewEngineParams { VirtualPaths = moduleLocations })); - Logger.Debug("Module locations:\r\n\t-{0}", string.Join("\r\n\t-", moduleLocations.ToArray())); + //Logger.Debug("Module locations:\r\n\t-{0}", string.Join("\r\n\t-", moduleLocations.ToArray())); var requestViewEngines = new ViewEngineCollection( themeViewEngines diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index a867a4a91..4245c8db9 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -135,6 +135,7 @@ <Compile Include="ContentManagement\Aspects\ICommonAspect.cs"> <SubType>Code</SubType> </Compile> + <Compile Include="ContentManagement\Aspects\IRoutableAspect.cs" /> <Compile Include="ContentManagement\ContentExtensions.cs"> <SubType>Code</SubType> </Compile> From 379e9a60e832ab92c16fbe9893b11b6d69f14cf1 Mon Sep 17 00:00:00 2001 From: Louis DeJardin <Louis.DeJardin@microsoft.com> Date: Tue, 8 Jun 2010 11:01:39 -0700 Subject: [PATCH 53/66] Updating use of routable path constraint --HG-- branch : dev --- .../Routable/Controllers/ItemController.cs | 12 +++++++++--- .../Core/Routable/Drivers/RoutableDriver.cs | 1 + .../Services/RoutablePathConstraint.cs | 18 +++++++++--------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs index 1c9c2ba5b..82d7ceca0 100644 --- a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs @@ -12,15 +12,21 @@ namespace Orchard.Core.Routable.Controllers { [ValidateInput(false)] public class ItemController : Controller { private readonly IContentManager _contentManager; + private readonly IRoutablePathConstraint _routablePathConstraint; - public ItemController(IContentManager contentManager) { + public ItemController(IContentManager contentManager, IRoutablePathConstraint routablePathConstraint) { _contentManager = contentManager; + _routablePathConstraint = routablePathConstraint; } public ActionResult Display(string path) { + var matchedPath = _routablePathConstraint.FindPath(path); + if (string.IsNullOrEmpty(matchedPath)) { + throw new ApplicationException("404 - should not have passed path constraint"); + } var hits = _contentManager .Query<IsRoutable, RoutableRecord>(VersionOptions.Published) - .Where(r => r.Path == path) + .Where(r => r.Path == matchedPath) .Slice(0, 2); if (hits.Count() == 0) { throw new ApplicationException("404 - should not have passed path constraint"); @@ -34,7 +40,7 @@ namespace Orchard.Core.Routable.Controllers { PrepareDisplayViewModel(model.Routable); return View("Display", model); } - + private void PrepareDisplayViewModel(ContentItemViewModel<IRoutableAspect> itemViewModel) { if (string.IsNullOrEmpty(itemViewModel.TemplateName)) { itemViewModel.TemplateName = "Items/Contents.Item"; diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs index 60efef1ff..b3a2f6e02 100644 --- a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs +++ b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs @@ -16,6 +16,7 @@ namespace Orchard.Core.Routable.Drivers { part.Record.Path = "routable" + part.ContentItem.Id; return base.Editor(part, updater); } + //private const string TemplateName = "Parts/Common.Routable"; //private readonly IOrchardServices _services; diff --git a/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs index afda64234..231fed3d3 100644 --- a/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs +++ b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs @@ -13,7 +13,7 @@ namespace Orchard.Core.Routable.Services { /// Singleton object, per Orchard Shell instance. We need to protect concurrent access to the dictionary. /// </summary> private readonly object _syncLock = new object(); - private IDictionary<string, string> _slugs = new Dictionary<string, string>(); + private IDictionary<string, string> _paths = new Dictionary<string, string>(); public RoutablePathConstraint() { Logger = NullLogger.Instance; @@ -21,31 +21,31 @@ namespace Orchard.Core.Routable.Services { public ILogger Logger { get; set; } - public void SetSlugs(IEnumerable<string> slugs) { + public void SetPaths(IEnumerable<string> paths) { // Make a copy to avoid performing potential lazy computation inside the lock - var slugsArray = slugs.ToArray(); + var slugsArray = paths.ToArray(); lock (_syncLock) { - _slugs = slugsArray.Distinct(StringComparer.OrdinalIgnoreCase).ToDictionary(value => value, StringComparer.OrdinalIgnoreCase); + _paths = slugsArray.Distinct(StringComparer.OrdinalIgnoreCase).ToDictionary(value => value, StringComparer.OrdinalIgnoreCase); } } - public string FindSlug(string slug) { + public string FindPath(string path) { lock (_syncLock) { string actual; - return _slugs.TryGetValue(slug, out actual) ? actual : slug; + return _paths.TryGetValue(path, out actual) ? actual : path; } } public void AddSlug(string slug) { lock (_syncLock) { - _slugs[slug] = slug; + _paths[slug] = slug; } } public void RemoveSlug(string slug) { lock (_syncLock) { - _slugs.Remove(slug); + _paths.Remove(slug); } } @@ -58,7 +58,7 @@ namespace Orchard.Core.Routable.Services { var parameterValue = Convert.ToString(value); lock (_syncLock) { - return _slugs.ContainsKey(parameterValue); + return _paths.ContainsKey(parameterValue); } } From 957452989891bbe59e3425e6642a69f95d206b1b Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Tue, 8 Jun 2010 11:42:32 -0700 Subject: [PATCH 54/66] Prevent empty content items to be indexed (menu item) Added an IsDirty property to IIndexDocument Once handlers have contributed to index information, if a document is not dirty, don't add it to the index --HG-- branch : dev --- .../Indexing/DefaultIndexProviderTests.cs | 33 +++++++++++++++++++ .../Indexing/Lucene/DefaultIndexDocument.cs | 10 ++++++ .../Indexing/Services/IndexingTaskExecutor.cs | 19 +++++++---- src/Orchard/Indexing/IIndexDocument.cs | 4 +++ 4 files changed, 59 insertions(+), 7 deletions(-) diff --git a/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs b/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs index f92333d91..9152c2b98 100644 --- a/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs +++ b/src/Orchard.Core.Tests/Indexing/DefaultIndexProviderTests.cs @@ -216,5 +216,38 @@ namespace Orchard.Tests.Indexing { _provider.Store("default", _provider.New(1).Add("body", null)); Assert.That(_provider.IsEmpty("default"), Is.False); } + + [Test] + public void IsDirtyShouldBeFalseForNewDocuments() { + IIndexDocument doc = _provider.New(1); + Assert.That(doc.IsDirty, Is.False); + } + + + [Test] + public void IsDirtyShouldBeTrueWhenIndexIsModified() { + IIndexDocument doc; + + doc = _provider.New(1); + doc.Add("foo", "value"); + Assert.That(doc.IsDirty, Is.True); + + doc = _provider.New(1); + doc.Add("foo", false); + Assert.That(doc.IsDirty, Is.True); + + doc = _provider.New(1); + doc.Add("foo", (float)1.0); + Assert.That(doc.IsDirty, Is.True); + + doc = _provider.New(1); + doc.Add("foo", 1); + Assert.That(doc.IsDirty, Is.True); + + doc = _provider.New(1); + doc.Add("foo", DateTime.Now); + Assert.That(doc.IsDirty, Is.True); + + } } } diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexDocument.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexDocument.cs index 02eae5b1c..571a06cc0 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexDocument.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultIndexDocument.cs @@ -12,13 +12,17 @@ namespace Orchard.Core.Indexing.Lucene { public List<AbstractField> Fields { get; private set; } private AbstractField _previousField; + public int Id { get; private set; } public DefaultIndexDocument(int documentId) { Fields = new List<AbstractField>(); SetContentItemId(documentId); + IsDirty = false; } + public bool IsDirty { get; private set; } + public IIndexDocument Add(string name, string value) { return Add(name, value, false); } @@ -35,36 +39,42 @@ namespace Orchard.Core.Indexing.Lucene { } _previousField = new Field(name, value, Field.Store.YES, Field.Index.ANALYZED); + IsDirty = true; return this; } public IIndexDocument Add(string name, DateTime value) { AppendPreviousField(); _previousField = new Field(name, DateTools.DateToString(value, DateTools.Resolution.SECOND), Field.Store.YES, Field.Index.NOT_ANALYZED); + IsDirty = true; return this; } public IIndexDocument Add(string name, int value) { AppendPreviousField(); _previousField = new NumericField(name, Field.Store.YES, true).SetIntValue(value); + IsDirty = true; return this; } public IIndexDocument Add(string name, bool value) { AppendPreviousField(); _previousField = new Field(name, value.ToString().ToLower(), Field.Store.YES, Field.Index.NOT_ANALYZED); + IsDirty = true; return this; } public IIndexDocument Add(string name, float value) { AppendPreviousField(); _previousField = new NumericField(name, Field.Store.YES, true).SetFloatValue(value); + IsDirty = true; return this; } public IIndexDocument Add(string name, object value) { AppendPreviousField(); _previousField = new Field(name, value.ToString(), Field.Store.NO, Field.Index.NOT_ANALYZED); + IsDirty = true; return this; } diff --git a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs index baa9b1b8d..bb1bff80f 100644 --- a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs +++ b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs @@ -91,10 +91,12 @@ namespace Orchard.Core.Indexing.Services { handler.Indexing(context); } - updateIndexDocuments.Add(context.IndexDocument); + if ( context.IndexDocument.IsDirty ) { + updateIndexDocuments.Add(context.IndexDocument); - foreach (var handler in _handlers) { - handler.Indexed(context); + foreach ( var handler in _handlers ) { + handler.Indexed(context); + } } } catch (Exception ex) { @@ -146,11 +148,14 @@ namespace Orchard.Core.Indexing.Services { handler.Indexing(context); } - updateIndexDocuments.Add(context.IndexDocument); - - foreach (var handler in _handlers) { - handler.Indexed(context); + if ( context.IndexDocument.IsDirty ) { + updateIndexDocuments.Add(context.IndexDocument); + + foreach (var handler in _handlers) { + handler.Indexed(context); + } } + } catch (Exception ex) { Logger.Warning(ex, "Unable to process indexing task #{0}", taskRecord.Id); diff --git a/src/Orchard/Indexing/IIndexDocument.cs b/src/Orchard/Indexing/IIndexDocument.cs index 36abb1b22..574eb612b 100644 --- a/src/Orchard/Indexing/IIndexDocument.cs +++ b/src/Orchard/Indexing/IIndexDocument.cs @@ -24,6 +24,10 @@ namespace Orchard.Indexing { /// </summary> IIndexDocument Analyze(bool analyze); + /// <summary> + /// Whether some property have been added to this document, or otherwise if it's empty + /// </summary> + bool IsDirty { get; } } } \ No newline at end of file From 598d39006f945a33508d504c405a9a6bb28d5f7d Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Tue, 8 Jun 2010 11:51:37 -0700 Subject: [PATCH 55/66] Prevents the index to be accessed when it is rebuilt Also call UpdateIndex() to take the rebuilt index into account immediately --HG-- branch : dev --- .../Indexing/Lucene/DefaultSearchBuilder.cs | 22 +++++++++++++++++-- .../Controllers/AdminController.cs | 1 + .../Orchard.Search/Services/SearchService.cs | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs b/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs index 93a084672..a68965594 100644 --- a/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs +++ b/src/Orchard.Web/Core/Indexing/Lucene/DefaultSearchBuilder.cs @@ -155,7 +155,16 @@ namespace Orchard.Core.Indexing.Lucene { public IEnumerable<ISearchHit> Search() { var query = CreateQuery(); - var searcher = new IndexSearcher(_directory, true); + IndexSearcher searcher; + + try { + searcher = new IndexSearcher(_directory, true); + } + catch { + // index might not exist if it has been rebuilt + Logger.Information("Attempt to read a none existing index"); + return Enumerable.Empty<ISearchHit>(); + } try { var sort = String.IsNullOrEmpty(_sort) @@ -188,8 +197,17 @@ namespace Orchard.Core.Indexing.Lucene { public int Count() { var query = CreateQuery(); + IndexSearcher searcher; + + try { + searcher = new IndexSearcher(_directory, true); + } + catch { + // index might not exist if it has been rebuilt + Logger.Information("Attempt to read a none existing index"); + return 0; + } - var searcher = new IndexSearcher(_directory, true); try { var hits = searcher.Search(query, Int16.MaxValue); Logger.Information("Search results: {0}", hits.scoreDocs.Length); diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs index 217e1db53..089d681a4 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs @@ -43,6 +43,7 @@ namespace Orchard.Search.Controllers { return new HttpUnauthorizedResult(); _searchService.RebuildIndex(); + _searchService.UpdateIndex(); return RedirectToAction("Index"); } diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs index f68d0919e..289cd57ba 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs @@ -63,6 +63,7 @@ namespace Orchard.Search.Services searchProvider.DeleteIndex(SearchIndexName); searchProvider.CreateIndex(SearchIndexName); // or just reset the updated date and let the background process recreate the index + Services.Notifier.Information(T("The search index has been rebuilt.")); } From 1b39eb3bc02cd6b2f3b830214482a4eb3015744e Mon Sep 17 00:00:00 2001 From: Louis DeJardin <Louis.DeJardin@microsoft.com> Date: Tue, 8 Jun 2010 12:01:00 -0700 Subject: [PATCH 56/66] Changing IRoutablePathConstraint from slug methods to path methods --HG-- branch : dev --- src/Orchard.Web/Core/Routable/IRoutablePathConstraint.cs | 8 ++++---- .../Core/Routable/Services/RoutablePathConstraint.cs | 8 ++++---- .../Routable/Services/RoutablePathConstraintUpdator.cs | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Orchard.Web/Core/Routable/IRoutablePathConstraint.cs b/src/Orchard.Web/Core/Routable/IRoutablePathConstraint.cs index 63f5d9a85..fd20e37e5 100644 --- a/src/Orchard.Web/Core/Routable/IRoutablePathConstraint.cs +++ b/src/Orchard.Web/Core/Routable/IRoutablePathConstraint.cs @@ -3,9 +3,9 @@ using System.Web.Routing; namespace Orchard.Core.Routable { public interface IRoutablePathConstraint : IRouteConstraint, ISingletonDependency { - void SetSlugs(IEnumerable<string> slugs); - string FindSlug(string slug); - void AddSlug(string slug); - void RemoveSlug(string slug); + void SetPaths(IEnumerable<string> paths); + string FindPath(string path); + void AddPath(string path); + void RemovePath(string path); } } diff --git a/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs index 231fed3d3..ddde25951 100644 --- a/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs +++ b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraint.cs @@ -37,15 +37,15 @@ namespace Orchard.Core.Routable.Services { } } - public void AddSlug(string slug) { + public void AddPath(string path) { lock (_syncLock) { - _paths[slug] = slug; + _paths[path] = path; } } - public void RemoveSlug(string slug) { + public void RemovePath(string path) { lock (_syncLock) { - _paths.Remove(slug); + _paths.Remove(path); } } diff --git a/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraintUpdator.cs b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraintUpdator.cs index f2902e0aa..5f5a8eb3d 100644 --- a/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraintUpdator.cs +++ b/src/Orchard.Web/Core/Routable/Services/RoutablePathConstraintUpdator.cs @@ -30,7 +30,7 @@ namespace Orchard.Core.Routable.Services { private void Refresh() { var slugs = _repository.Fetch(r => r.ContentItemVersionRecord.Published && r.Path != "" && r.Path != null).Select(r => r.Path); - _pageSlugConstraint.SetSlugs(slugs); + _pageSlugConstraint.SetPaths(slugs); } } } From 57e830f19e04fcfc552ae6c22c299bf94874f124 Mon Sep 17 00:00:00 2001 From: Louis DeJardin <Louis.DeJardin@microsoft.com> Date: Tue, 8 Jun 2010 12:05:29 -0700 Subject: [PATCH 57/66] Content manager assigning values to definition properties DefaultContentManager now takes a dependency on IContentDefinitionManager ContentItem.TypeDefinition assigned to ContentTypeDefinition instance when creating ContentPart.TypePartDefinition assigned to ContentTypeDefinition.Part instance as added Empty definition instances are created as code-only types and parts are created --HG-- branch : dev --- .../Providers/CommonAspectProviderTests.cs | 5 ++- .../Common/Services/RoutableServiceTests.cs | 3 ++ .../Feeds/Controllers/FeedControllerTests.cs | 4 +- .../Scheduling/ScheduledTaskExecutorTests.cs | 2 + .../Scheduling/ScheduledTaskManagerTests.cs | 2 + .../ContentManagement/ContentQueryTests.cs | 3 ++ .../DefaultContentManagerTests.cs | 42 ++++++++++++++++++- .../Handlers/ContentHandlerTests.cs | 3 +- .../Handlers/ModelBuilderTests.cs | 7 ++-- .../Routable/Controllers/ItemController.cs | 1 + .../Orchard.Roles/Models/UserSimulation.cs | 4 +- .../Modules/Orchard.Setup/SetupMode.cs | 4 +- src/Orchard/ContentManagement/ContentPart.cs | 4 +- .../DefaultContentManager.cs | 21 +++++++--- .../Drivers/ContentPartDriver.cs | 21 +++++----- .../Handlers/ActivatingContentContext.cs | 3 ++ .../Handlers/ContentItemBuilder.cs | 29 ++++++++++--- .../MetaData/ContentPartHandler.cs | 11 ++--- .../MetaData/ContentPartInfo.cs | 9 ++-- 19 files changed, 137 insertions(+), 41 deletions(-) diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs index 73cbde057..210d12203 100644 --- a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs +++ b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs @@ -6,6 +6,7 @@ using JetBrains.Annotations; using Moq; using NUnit.Framework; using Orchard.ContentManagement.Aspects; +using Orchard.ContentManagement.MetaData; using Orchard.Core.Common; using Orchard.Core.Common.Handlers; using Orchard.Core.Common.Models; @@ -25,6 +26,7 @@ namespace Orchard.Core.Tests.Common.Providers { private Mock<IAuthenticationService> _authn; private Mock<IAuthorizationService> _authz; private Mock<IMembershipService> _membership; + private Mock<IContentDefinitionManager> _contentDefinitionManager; public override void Register(ContainerBuilder builder) { builder.RegisterType<DefaultContentManager>().As<IContentManager>(); @@ -35,11 +37,12 @@ namespace Orchard.Core.Tests.Common.Providers { _authn = new Mock<IAuthenticationService>(); _authz = new Mock<IAuthorizationService>(); _membership = new Mock<IMembershipService>(); + _contentDefinitionManager = new Mock<IContentDefinitionManager>(); builder.RegisterInstance(_authn.Object); builder.RegisterInstance(_authz.Object); builder.RegisterInstance(_membership.Object); - + builder.RegisterInstance(_contentDefinitionManager.Object); } protected override IEnumerable<Type> DatabaseTypes { diff --git a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs index 695589dbb..51d5af0d7 100644 --- a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs +++ b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs @@ -2,10 +2,12 @@ using System.Collections.Generic; using Autofac; using JetBrains.Annotations; +using Moq; using NUnit.Framework; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; using Orchard.ContentManagement.Handlers; +using Orchard.ContentManagement.MetaData; using Orchard.ContentManagement.Records; using Orchard.Core.Common.Models; using Orchard.Core.Common.Services; @@ -27,6 +29,7 @@ namespace Orchard.Core.Tests.Common.Services { public override void Register(ContainerBuilder builder) { builder.RegisterType<DefaultContentManager>().As<IContentManager>(); builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>(); + builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object); builder.RegisterType<ThingHandler>().As<IContentHandler>(); builder.RegisterType<StuffHandler>().As<IContentHandler>(); diff --git a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs index e8cdd485a..3970d40f7 100644 --- a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs +++ b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs @@ -9,6 +9,8 @@ using Moq; using NUnit.Framework; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; +using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Models; using Orchard.Core.Common.Models; using Orchard.Core.Feeds; using Orchard.Core.Feeds.Controllers; @@ -145,7 +147,7 @@ namespace Orchard.Core.Tests.Feeds.Controllers { [Test] public void CorePartValuesAreExtracted() { var clock = new StubClock(); - var hello = new ContentItemBuilder("hello") + var hello = new ContentItemBuilder(new ContentTypeDefinitionBuilder().Named("hello").Build()) .Weld<CommonAspect>() .Weld<RoutableAspect>() .Weld<BodyAspect>() diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs index cf3d73786..485167ce4 100644 --- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs +++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs @@ -4,6 +4,7 @@ using Autofac; using Moq; using NUnit.Framework; using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; using Orchard.ContentManagement.Records; using Orchard.Core.Scheduling.Models; using Orchard.Core.Scheduling.Services; @@ -29,6 +30,7 @@ namespace Orchard.Core.Tests.Scheduling { builder.RegisterInstance(new Mock<IOrchardServices>().Object); builder.RegisterType<DefaultContentManager>().As<IContentManager>(); builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>(); + builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object); builder.RegisterType<ScheduledTaskExecutor>().As<IBackgroundTask>().Named("ScheduledTaskExecutor", typeof(IBackgroundTask)); builder.RegisterInstance(_handler).As<IScheduledTaskHandler>(); diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs index fe58b9a06..e67d666f5 100644 --- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs +++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs @@ -5,6 +5,7 @@ using Autofac; using Moq; using NUnit.Framework; using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; using Orchard.ContentManagement.Records; using Orchard.Core.Scheduling.Models; using Orchard.Core.Scheduling.Services; @@ -33,6 +34,7 @@ namespace Orchard.Core.Tests.Scheduling { builder.RegisterInstance(_mockServices.Object); builder.RegisterType<DefaultContentManager>().As<IContentManager>(); builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>(); + builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object); builder.RegisterType<ScheduledTaskManager>().As<IScheduledTaskManager>(); } diff --git a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs index 8b37ebe65..031108e64 100644 --- a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs +++ b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs @@ -1,7 +1,9 @@ using System.Linq; using Autofac; +using Moq; using NHibernate; using NUnit.Framework; +using Orchard.ContentManagement.MetaData; using Orchard.Data; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; @@ -44,6 +46,7 @@ namespace Orchard.Tests.ContentManagement { builder.RegisterModule(new ContentModule()); builder.RegisterType<DefaultContentManager>().As<IContentManager>().SingleInstance(); builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>(); + builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object); builder.RegisterType<AlphaHandler>().As<IContentHandler>(); builder.RegisterType<BetaHandler>().As<IContentHandler>(); diff --git a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs index 36de12e5d..5a0397f76 100644 --- a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs +++ b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs @@ -2,8 +2,11 @@ using System.Diagnostics; using System.Linq; using Autofac; +using Moq; using NHibernate; using NUnit.Framework; +using Orchard.ContentManagement.MetaData; +using Orchard.ContentManagement.MetaData.Builders; using Orchard.Data; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; @@ -18,6 +21,7 @@ namespace Orchard.Tests.ContentManagement { private IContentManager _manager; private ISessionFactory _sessionFactory; private ISession _session; + private Mock<IContentDefinitionManager> _contentDefinitionManager; [TestFixtureSetUp] public void InitFixture() { @@ -39,10 +43,12 @@ namespace Orchard.Tests.ContentManagement { [SetUp] public void Init() { + _contentDefinitionManager = new Mock<IContentDefinitionManager>(); + var builder = new ContainerBuilder(); - //builder.RegisterModule(new ImplicitCollectionSupportModule()); builder.RegisterType<DefaultContentManager>().As<IContentManager>(); builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>(); + builder.RegisterInstance(_contentDefinitionManager.Object); builder.RegisterType<AlphaHandler>().As<IContentHandler>(); builder.RegisterType<BetaHandler>().As<IContentHandler>(); @@ -459,6 +465,40 @@ namespace Orchard.Tests.ContentManagement { Assert.That(gammas[3].Version, Is.EqualTo(4)); } + [Test] + public void EmptyTypeDefinitionShouldBeCreatedIfNotAlreadyDefined() { + var contentItem = _manager.New("no-such-type"); + Assert.That(contentItem.ContentType, Is.EqualTo("no-such-type")); + Assert.That(contentItem.TypeDefinition, Is.Not.Null); + Assert.That(contentItem.TypeDefinition.Name, Is.EqualTo("no-such-type")); + Assert.That(contentItem.TypeDefinition.Settings.Count(), Is.EqualTo(0)); + Assert.That(contentItem.TypeDefinition.Parts.Count(), Is.EqualTo(0)); + } + + + [Test] + public void ExistingTypeAndPartDefinitionShouldBeUsed() { + var alphaType = new ContentTypeDefinitionBuilder() + .Named("alpha") + .WithSetting("x", "1") + .WithPart("foo") + .WithPart("Flavored", part => part.WithSetting("spin", "clockwise")) + .Build(); + + _contentDefinitionManager + .Setup(x => x.GetTypeDefinition("alpha")) + .Returns(alphaType); + + var contentItem = _manager.New("alpha"); + Assert.That(contentItem.ContentType, Is.EqualTo("alpha")); + Assert.That(contentItem.TypeDefinition, Is.Not.Null); + Assert.That(contentItem.TypeDefinition, Is.SameAs(alphaType)); + + var flavored = contentItem.As<Flavored>(); + Assert.That(flavored, Is.Not.Null); + Assert.That(flavored.TypePartDefinition, Is.Not.Null); + Assert.That(flavored.TypePartDefinition.Settings["spin"], Is.EqualTo("clockwise")); + } } } diff --git a/src/Orchard.Tests/ContentManagement/Handlers/ContentHandlerTests.cs b/src/Orchard.Tests/ContentManagement/Handlers/ContentHandlerTests.cs index c7d7ae087..3f7b302e0 100644 --- a/src/Orchard.Tests/ContentManagement/Handlers/ContentHandlerTests.cs +++ b/src/Orchard.Tests/ContentManagement/Handlers/ContentHandlerTests.cs @@ -1,6 +1,7 @@ using NUnit.Framework; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; +using Orchard.ContentManagement.MetaData.Builders; namespace Orchard.Tests.ContentManagement.Handlers { @@ -22,7 +23,7 @@ namespace Orchard.Tests.ContentManagement.Handlers { public void PartShouldBeAddedBasedOnSimplePredicate() { var modelDriver = new TestModelHandler(); - var builder = new ContentItemBuilder("testing"); + var builder = new ContentItemBuilder(new ContentTypeDefinitionBuilder().Named("testing").Build()); ((IContentHandler)modelDriver).Activating(new ActivatingContentContext { Builder = builder, ContentType = "testing" }); var model = builder.Build(); Assert.That(model.Is<TestModelPart>(), Is.True); diff --git a/src/Orchard.Tests/ContentManagement/Handlers/ModelBuilderTests.cs b/src/Orchard.Tests/ContentManagement/Handlers/ModelBuilderTests.cs index ea19ecc5c..ab4aada7e 100644 --- a/src/Orchard.Tests/ContentManagement/Handlers/ModelBuilderTests.cs +++ b/src/Orchard.Tests/ContentManagement/Handlers/ModelBuilderTests.cs @@ -5,6 +5,7 @@ using System.Text; using NUnit.Framework; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; +using Orchard.ContentManagement.MetaData.Builders; using Orchard.Tests.ContentManagement.Models; namespace Orchard.Tests.ContentManagement.Handlers { @@ -12,21 +13,21 @@ namespace Orchard.Tests.ContentManagement.Handlers { public class ModelBuilderTests { [Test] public void BuilderShouldReturnWorkingModelWithTypeAndId() { - var builder = new ContentItemBuilder("foo"); + var builder = new ContentItemBuilder(new ContentTypeDefinitionBuilder().Named("foo").Build()); var model = builder.Build(); Assert.That(model.ContentType, Is.EqualTo("foo")); } [Test] public void IdShouldDefaultToZero() { - var builder = new ContentItemBuilder("foo"); + var builder = new ContentItemBuilder(new ContentTypeDefinitionBuilder().Named("foo").Build()); var model = builder.Build(); Assert.That(model.Id, Is.EqualTo(0)); } [Test] public void WeldShouldAddPartToModel() { - var builder = new ContentItemBuilder("foo"); + var builder = new ContentItemBuilder(new ContentTypeDefinitionBuilder().Named("foo").Build()); builder.Weld<Alpha>(); var model = builder.Build(); diff --git a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs index 82d7ceca0..856f53052 100644 --- a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs @@ -24,6 +24,7 @@ namespace Orchard.Core.Routable.Controllers { if (string.IsNullOrEmpty(matchedPath)) { throw new ApplicationException("404 - should not have passed path constraint"); } + var hits = _contentManager .Query<IsRoutable, RoutableRecord>(VersionOptions.Published) .Where(r => r.Path == matchedPath) diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Models/UserSimulation.cs b/src/Orchard.Web/Modules/Orchard.Roles/Models/UserSimulation.cs index 1ce3b8d9f..144ebb212 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Models/UserSimulation.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Models/UserSimulation.cs @@ -1,12 +1,14 @@ using System.Collections.Generic; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; +using Orchard.ContentManagement.MetaData.Builders; using Orchard.Security; namespace Orchard.Roles.Models { public static class UserSimulation { public static IUser Create(string role) { - var simulation = new ContentItemBuilder("user") + var simulationType = new ContentTypeDefinitionBuilder().Named("user").Build(); + var simulation = new ContentItemBuilder(simulationType) .Weld<SimulatedUser>() .Weld<SimulatedUserRoles>() .Build(); diff --git a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs index ab66f8d0d..26c715674 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs @@ -7,6 +7,7 @@ using Orchard.Commands; using Orchard.Commands.Builtin; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; +using Orchard.ContentManagement.MetaData.Builders; using Orchard.Data.Builders; using Orchard.Environment.Extensions; using Orchard.Localization; @@ -90,7 +91,8 @@ namespace Orchard.Setup { class SafeModeSiteService : ISiteService { public ISite GetSiteSettings() { - var site = new ContentItemBuilder("site") + var siteType = new ContentTypeDefinitionBuilder().Named("site").Build(); + var site = new ContentItemBuilder(siteType) .Weld<SafeModeSite>() .Build(); diff --git a/src/Orchard/ContentManagement/ContentPart.cs b/src/Orchard/ContentManagement/ContentPart.cs index f360ef5bc..8f485aa9a 100644 --- a/src/Orchard/ContentManagement/ContentPart.cs +++ b/src/Orchard/ContentManagement/ContentPart.cs @@ -4,9 +4,9 @@ using Orchard.ContentManagement.Utilities; namespace Orchard.ContentManagement { public abstract class ContentPart : IContent { public virtual ContentItem ContentItem { get; set; } - public ContentTypeDefinition TypeDefinition { get; set; } + public ContentTypeDefinition TypeDefinition { get { return ContentItem.TypeDefinition; } } public ContentTypeDefinition.Part TypePartDefinition { get; set; } - public ContentPartDefinition PartDefinition { get; set; } + public ContentPartDefinition PartDefinition { get { return TypePartDefinition.PartDefinition; } } } public class ContentPart<TRecord> : ContentPart { diff --git a/src/Orchard/ContentManagement/DefaultContentManager.cs b/src/Orchard/ContentManagement/DefaultContentManager.cs index 06b77b4d3..e4e4a6973 100644 --- a/src/Orchard/ContentManagement/DefaultContentManager.cs +++ b/src/Orchard/ContentManagement/DefaultContentManager.cs @@ -3,6 +3,9 @@ using System.Collections.Generic; using System.Linq; using Autofac; using Orchard.ContentManagement.Handlers; +using Orchard.ContentManagement.MetaData; +using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Models; using Orchard.ContentManagement.Records; using Orchard.Data; using Orchard.Mvc.ViewModels; @@ -13,6 +16,7 @@ namespace Orchard.ContentManagement { private readonly IRepository<ContentTypeRecord> _contentTypeRepository; private readonly IRepository<ContentItemRecord> _contentItemRepository; private readonly IRepository<ContentItemVersionRecord> _contentItemVersionRepository; + private readonly IContentDefinitionManager _contentDefinitionManager; private readonly Func<IContentManagerSession> _contentManagerSession; public DefaultContentManager( @@ -20,11 +24,13 @@ namespace Orchard.ContentManagement { IRepository<ContentTypeRecord> contentTypeRepository, IRepository<ContentItemRecord> contentItemRepository, IRepository<ContentItemVersionRecord> contentItemVersionRepository, + IContentDefinitionManager contentDefinitionManager, Func<IContentManagerSession> contentManagerSession) { _context = context; _contentTypeRepository = contentTypeRepository; _contentItemRepository = contentItemRepository; _contentItemVersionRepository = contentItemVersionRepository; + _contentDefinitionManager = contentDefinitionManager; _contentManagerSession = contentManagerSession; } @@ -44,11 +50,16 @@ namespace Orchard.ContentManagement { } public virtual ContentItem New(string contentType) { + var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(contentType); + if (contentTypeDefinition == null) { + contentTypeDefinition = new ContentTypeDefinitionBuilder().Named(contentType).Build(); + } // create a new kernel for the model instance var context = new ActivatingContentContext { - ContentType = contentType, - Builder = new ContentItemBuilder(contentType) + ContentType = contentTypeDefinition.Name, + Definition = contentTypeDefinition, + Builder = new ContentItemBuilder(contentTypeDefinition) }; // invoke handlers to weld aspects onto kernel @@ -337,16 +348,16 @@ namespace Orchard.ContentManagement { handler.Created(context); } - if(options.IsPublished) { + if (options.IsPublished) { var publishContext = new PublishContentContext(contentItem, null); // invoke handlers to acquire state, or at least establish lazy loading callbacks - foreach ( var handler in Handlers ) { + foreach (var handler in Handlers) { handler.Publishing(publishContext); } // invoke handlers to acquire state, or at least establish lazy loading callbacks - foreach ( var handler in Handlers ) { + foreach (var handler in Handlers) { handler.Published(publishContext); } } diff --git a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs index 91b12f342..d399a19fa 100644 --- a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs +++ b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs @@ -31,19 +31,19 @@ namespace Orchard.ContentManagement.Drivers { return part == null ? null : Editor(part, context.Updater); } - protected virtual DriverResult Display(TContent part, string displayType) {return null;} - protected virtual DriverResult Editor(TContent part) {return null;} - protected virtual DriverResult Editor(TContent part, IUpdateModel updater) {return null;} + protected virtual DriverResult Display(TContent part, string displayType) { return null; } + protected virtual DriverResult Editor(TContent part) { return null; } + protected virtual DriverResult Editor(TContent part, IUpdateModel updater) { return null; } public ContentPartTemplateResult ContentPartTemplate(object model) { return new ContentPartTemplateResult(model, null, Prefix).Location(Zone); } - + public ContentPartTemplateResult ContentPartTemplate(object model, string template) { return new ContentPartTemplateResult(model, template, Prefix).Location(Zone); } - + public ContentPartTemplateResult ContentPartTemplate(object model, string template, string prefix) { return new ContentPartTemplateResult(model, template, prefix).Location(Zone); } @@ -52,11 +52,12 @@ namespace Orchard.ContentManagement.Drivers { return new CombinedResult(results); } - public IEnumerable<ContentPartInfo> GetPartInfo() - { - var contentPartInfo = new List<ContentPartInfo>() { - new ContentPartInfo() - {PartName = typeof(TContent).Name,Factory = () => new TContent()} + public IEnumerable<ContentPartInfo> GetPartInfo() { + var contentPartInfo = new[] { + new ContentPartInfo { + PartName = typeof (TContent).Name, + Factory = typePartDefinition => new TContent {TypePartDefinition = typePartDefinition} + } }; return contentPartInfo; diff --git a/src/Orchard/ContentManagement/Handlers/ActivatingContentContext.cs b/src/Orchard/ContentManagement/Handlers/ActivatingContentContext.cs index de3bb8a8d..3d202465b 100644 --- a/src/Orchard/ContentManagement/Handlers/ActivatingContentContext.cs +++ b/src/Orchard/ContentManagement/Handlers/ActivatingContentContext.cs @@ -1,6 +1,9 @@ +using Orchard.ContentManagement.MetaData.Models; + namespace Orchard.ContentManagement.Handlers { public class ActivatingContentContext { public string ContentType { get; set; } + public ContentTypeDefinition Definition { get; set; } public ContentItemBuilder Builder { get; set; } } } diff --git a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs index fc8449d6c..619558c58 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs @@ -1,9 +1,18 @@ -namespace Orchard.ContentManagement.Handlers { +using System.Collections.Generic; +using System.Linq; +using Orchard.ContentManagement.MetaData.Models; + +namespace Orchard.ContentManagement.Handlers { public class ContentItemBuilder { + private readonly ContentTypeDefinition _definition; private readonly ContentItem _item; - public ContentItemBuilder(string contentType) { - _item = new ContentItem { ContentType = contentType }; + public ContentItemBuilder(ContentTypeDefinition definition) { + _definition = definition; + _item = new ContentItem { + ContentType = definition.Name, + TypeDefinition = definition + }; } public ContentItem Build() { @@ -11,7 +20,18 @@ } public ContentItemBuilder Weld<TPart>() where TPart : ContentPart, new() { - var part = new TPart(); + var partName = typeof(TPart).Name; + + var typePartDefinition = _definition.Parts.FirstOrDefault(p => p.PartDefinition.Name == partName); + if (typePartDefinition == null) { + typePartDefinition = new ContentTypeDefinition.Part( + new ContentPartDefinition(partName), + new Dictionary<string, string>()); + } + + var part = new TPart { + TypePartDefinition = typePartDefinition + }; _item.Weld(part); return this; } @@ -20,6 +40,5 @@ _item.Weld(contentPart); return this; } - } } diff --git a/src/Orchard/ContentManagement/MetaData/ContentPartHandler.cs b/src/Orchard/ContentManagement/MetaData/ContentPartHandler.cs index 4a4403115..465ac806d 100644 --- a/src/Orchard/ContentManagement/MetaData/ContentPartHandler.cs +++ b/src/Orchard/ContentManagement/MetaData/ContentPartHandler.cs @@ -14,14 +14,15 @@ namespace Orchard.ContentManagement.MetaData { } public override void Activating(ActivatingContentContext context) { - var contentTypeRecord = _contentDefinitionManager.GetTypeDefinition(context.ContentType); - if (contentTypeRecord == null) + var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(context.ContentType); + if (contentTypeDefinition == null) return; - foreach(var partInfo in _contentPartDrivers.SelectMany(cpp => cpp.GetPartInfo())) { + foreach (var partInfo in _contentPartDrivers.SelectMany(cpp => cpp.GetPartInfo())) { var partName = partInfo.PartName; - if (contentTypeRecord.Parts.Any(p=>p.PartDefinition.Name == partName)) { - context.Builder.Weld(partInfo.Factory()); + var typePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(p => p.PartDefinition.Name == partName); + if (typePartDefinition != null) { + context.Builder.Weld(partInfo.Factory(typePartDefinition)); } } } diff --git a/src/Orchard/ContentManagement/MetaData/ContentPartInfo.cs b/src/Orchard/ContentManagement/MetaData/ContentPartInfo.cs index 23a731cbf..a7c8c190a 100644 --- a/src/Orchard/ContentManagement/MetaData/ContentPartInfo.cs +++ b/src/Orchard/ContentManagement/MetaData/ContentPartInfo.cs @@ -1,10 +1,9 @@ using System; +using Orchard.ContentManagement.MetaData.Models; -namespace Orchard.ContentManagement.MetaData -{ - public class ContentPartInfo - { +namespace Orchard.ContentManagement.MetaData { + public class ContentPartInfo { public string PartName { get; set; } - public Func<ContentPart> Factory { get; set; } + public Func<ContentTypeDefinition.Part, ContentPart> Factory { get; set; } } } From eb0a61b0873e4bfbe3e141f1eba284970f469d61 Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Tue, 8 Jun 2010 12:07:13 -0700 Subject: [PATCH 58/66] Corrected a bug which could cause the last content item to be indexed two times --HG-- branch : dev --- .../Core/Indexing/Services/IndexingTaskExecutor.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs index bb1bff80f..2cf986227 100644 --- a/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs +++ b/src/Orchard.Web/Core/Indexing/Services/IndexingTaskExecutor.cs @@ -113,10 +113,11 @@ namespace Orchard.Core.Indexing.Services { _indexProvider.SetLastIndexUtc(SearchIndexName, _clock.UtcNow); // retrieve not yet processed tasks - var taskRecords = _repository.Fetch(x => x.CreatedUtc >= lastIndexing) + var taskRecords = _repository.Fetch(x => x.CreatedUtc > lastIndexing) .ToArray(); - if (taskRecords.Length == 0) + // nothing to do ? + if (taskRecords.Length + updateIndexDocuments.Count == 0) return; Logger.Information("Processing {0} indexing tasks", taskRecords.Length); From 77a49e2000bdcd6309a29cb4a73ccb955d94e2c6 Mon Sep 17 00:00:00 2001 From: Suha Can <Suha.Can@microsoft.com> Date: Tue, 8 Jun 2010 12:37:33 -0700 Subject: [PATCH 59/66] - Patch from Aaron Rhoads concerning: Non-Rooted Theme Images - Corporate and Contoso Non-Rooted Admin/MenuItems Add-New Form --HG-- branch : dev --- src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx | 2 +- .../Themes/Contoso/Views/Layout.HomePage.ascx | 2 +- src/Orchard.Web/Themes/Contoso/Zones/Highlights.html | 2 +- .../Themes/Contoso/Zones/Home-Hero-Gallery.html | 6 +++--- .../Themes/Corporate/Views/Layout.HomePage.ascx | 4 ++-- src/Orchard.Web/Themes/Corporate/Views/Layout.ascx | 4 ++-- .../Themes/Corporate/Zones/Home-Hero-Gallery.html | 2 +- src/Orchard.Web/Themes/Corporate/Zones/Home-Hero.html | 10 +++++----- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx index 2a949c869..5881bb38e 100644 --- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx @@ -38,7 +38,7 @@ using (Html.BeginFormAntiForgeryPost()) { %> %> <h2><%=_Encoded("Add New Item") %></h2><% -using (Html.BeginFormAntiForgeryPost("/admin/navigation/create", FormMethod.Post)) { %> +using (Html.BeginFormAntiForgeryPost(Url.Action("create"), FormMethod.Post)) { %> <table class="menu items"> <colgroup> <col id="AddText" /> diff --git a/src/Orchard.Web/Themes/Contoso/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Contoso/Views/Layout.HomePage.ascx index d72869286..831aee24a 100644 --- a/src/Orchard.Web/Themes/Contoso/Views/Layout.HomePage.ascx +++ b/src/Orchard.Web/Themes/Contoso/Views/Layout.HomePage.ascx @@ -23,7 +23,7 @@ <div class="home-hero-container"> <div class="home-hero"> <%-- Init jQuery Slider --%> - <script src="/Themes/Contoso/Scripts/easySlider.js" type="text/javascript"></script> + <script src="<%= Url.Content("~/Themes/Contoso/Scripts/easySlider.js") %>" type="text/javascript"></script> <script type="text/javascript"> $(document).ready(function() { $("#slider").easySlider({ diff --git a/src/Orchard.Web/Themes/Contoso/Zones/Highlights.html b/src/Orchard.Web/Themes/Contoso/Zones/Highlights.html index d00f99423..aa4a147a0 100644 --- a/src/Orchard.Web/Themes/Contoso/Zones/Highlights.html +++ b/src/Orchard.Web/Themes/Contoso/Zones/Highlights.html @@ -16,7 +16,7 @@ </p> </div> <div class="three"> - <img src="/Themes/Contoso/Content/Images/icon-location.png" /> + <img src="Themes/Contoso/Content/Images/icon-location.png" /> <p> 1 Microsoft Way<br /> Redmond, WA 98444<br /> diff --git a/src/Orchard.Web/Themes/Contoso/Zones/Home-Hero-Gallery.html b/src/Orchard.Web/Themes/Contoso/Zones/Home-Hero-Gallery.html index 4a51637e1..7156962ff 100644 --- a/src/Orchard.Web/Themes/Contoso/Zones/Home-Hero-Gallery.html +++ b/src/Orchard.Web/Themes/Contoso/Zones/Home-Hero-Gallery.html @@ -1,7 +1,7 @@ <div id="slider"> <ul> - <li><img src="/Themes/Contoso/Content/Images/Gallery/feature01.jpg" alt="Orchard Rocks" /></li> - <li><img src="/Themes/Contoso/Content/Images/Gallery/feature02.jpg" alt="Orchard FTW" /></li> - <li><img src="/Themes/Contoso/Content/Images/Gallery/feature03.jpg" alt="Orchard Time" /></li> + <li><img src="Themes/Contoso/Content/Images/Gallery/feature01.jpg" alt="Orchard Rocks" /></li> + <li><img src="Themes/Contoso/Content/Images/Gallery/feature02.jpg" alt="Orchard FTW" /></li> + <li><img src="Themes/Contoso/Content/Images/Gallery/feature03.jpg" alt="Orchard Time" /></li> </ul> </div> diff --git a/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx index a01a36abd..172cf442a 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx @@ -32,7 +32,7 @@ <%-- Home Hero --%> <div class="main-box"> <div class="top"> - <img src="/Themes/Corporate/Content/Images/content-top.png" /></div> + <img src="<%= Url.Content("~/Themes/Corporate/Content/Images/content-top.png") %>" /></div> <div class="content group"> <% Html.Zone("home-hero-gallery"); %> @@ -41,7 +41,7 @@ </div> <div class="bottom"> - <img src="/Themes/Corporate/Content/Images/content-bottom.png" /></div> + <img src="<%= Url.Content("~/Themes/Corporate/Content/Images/content-bottom.png") %>" /></div> </div> <%-- Main Content Area --%> diff --git a/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx b/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx index fa3f583c9..e13257179 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx @@ -32,7 +32,7 @@ <%-- Content Hero --%> <div class="main-box"> <div class="top"> - <img src="/Themes/Corporate/Content/Images/content-top.png" /></div> + <img src="<%= Url.Content("~/Themes/Corporate/Content/Images/content-top.png") %>" /></div> <div class="content"> <div class="subpage group"> <div class="sub-content"> @@ -57,7 +57,7 @@ </div> <div class="bottom"> - <img src="/Themes/Corporate/Content/Images/content-bottom.png" /></div> + <img src="<%= Url.Content("~/Themes/Corporate/Content/Images/content-bottom.png") %>" /></div> </div> </div> diff --git a/src/Orchard.Web/Themes/Corporate/Zones/Home-Hero-Gallery.html b/src/Orchard.Web/Themes/Corporate/Zones/Home-Hero-Gallery.html index 07ec88acd..c25ef50b4 100644 --- a/src/Orchard.Web/Themes/Corporate/Zones/Home-Hero-Gallery.html +++ b/src/Orchard.Web/Themes/Corporate/Zones/Home-Hero-Gallery.html @@ -1,2 +1,2 @@  <div id="hm-image"> - <img src="/Themes/Corporate/Content/Images/jumping-people.jpg" /></div> \ No newline at end of file + <img src="Themes/Corporate/Content/Images/jumping-people.jpg" /></div> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Corporate/Zones/Home-Hero.html b/src/Orchard.Web/Themes/Corporate/Zones/Home-Hero.html index 2cc82e6b0..e724d418b 100644 --- a/src/Orchard.Web/Themes/Corporate/Zones/Home-Hero.html +++ b/src/Orchard.Web/Themes/Corporate/Zones/Home-Hero.html @@ -9,16 +9,16 @@ </div> <ul id="hm-icons"> <li> - <img src="/Themes/Corporate/Content/Images/icons/icon-1.png" /> + <img src="Themes/Corporate/Content/Images/icons/icon-1.png" /> <a href="#" title="Bullet Point One"> Bullet Point One</a></li> - <li><img src="/Themes/Corporate/Content/Images/icons/icon-2.png" /><a href="#" title="Bullet Point One"> + <li><img src="Themes/Corporate/Content/Images/icons/icon-2.png" /><a href="#" title="Bullet Point One"> Bullet Point Two</a></li> - <li><img src="/Themes/Corporate/Content/Images/icons/icon-3.png" /><a href="#" title="Bullet Point One"> + <li><img src="Themes/Corporate/Content/Images/icons/icon-3.png" /><a href="#" title="Bullet Point One"> Bullet Point Three</a></li> - <li><img src="/Themes/Corporate/Content/Images/icons/icon-4.png" /><a href="#" title="Bullet Point One"> + <li><img src="Themes/Corporate/Content/Images/icons/icon-4.png" /><a href="#" title="Bullet Point One"> Bullet Point Four</a></li> - <li><img src="/Themes/Corporate/Content/Images/icons/icon-5.png" /><a href="#" title="Bullet Point One"> + <li><img src="Themes/Corporate/Content/Images/icons/icon-5.png" /><a href="#" title="Bullet Point One"> Bullet Point Five</a></li> </ul> </div> From 4fe81286db72853b3fbced0a3b49aadc88cfb613 Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Tue, 8 Jun 2010 13:13:24 -0700 Subject: [PATCH 60/66] Corrected typo --HG-- branch : dev --- src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx index f68e7e59b..151100a64 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Search.ViewModels.SearchIndexViewModel>" %> <%@ Import Namespace="Orchard.Mvc.Html" %><% Html.RegisterStyle("admin.css"); %> -<h1><%=Html.TitleForPage(T("Search Index Mangement").ToString()) %></h1><% +<h1><%=Html.TitleForPage(T("Search Index Management").ToString()) %></h1><% using (Html.BeginForm("update", "admin", FormMethod.Post, new {area = "Orchard.Search"})) { %> <fieldset> <p><%=T("The search index was last updated {0}. <button type=\"submit\" title=\"Update the search index.\" class=\"primaryAction\">Update</button>", Html.DateTimeRelative(Model.IndexUpdatedUtc))%></p> From 290874c8dd6b778fa504c48ba27d7499d0836bc0 Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Tue, 8 Jun 2010 13:32:26 -0700 Subject: [PATCH 61/66] Corrected handler invocation for Indexed event --HG-- branch : dev --- src/Orchard/ContentManagement/Handlers/ContentHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs index de68ae0b8..61264e60f 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs @@ -242,7 +242,7 @@ namespace Orchard.ContentManagement.Handlers { void IContentHandler.Indexed(IndexContentContext context) { foreach ( var filter in Filters.OfType<IContentStorageFilter>() ) filter.Indexed(context); - Indexing(context); + Indexed(context); } void IContentHandler.GetContentItemMetadata(GetContentItemMetadataContext context) { From 5c0a0cbe8acdbdb5dcd81ac8fb614f27bc8bcda7 Mon Sep 17 00:00:00 2001 From: Suha Can <Suha.Can@microsoft.com> Date: Tue, 8 Jun 2010 13:54:50 -0700 Subject: [PATCH 62/66] - Adding a base driver for the localized part on which UI work can be built. --HG-- branch : dev --- .../Core/Localization/Drivers/LocalizedDriver.cs | 9 +++++++++ src/Orchard.Web/Core/Orchard.Core.csproj | 1 + 2 files changed, 10 insertions(+) create mode 100644 src/Orchard.Web/Core/Localization/Drivers/LocalizedDriver.cs diff --git a/src/Orchard.Web/Core/Localization/Drivers/LocalizedDriver.cs b/src/Orchard.Web/Core/Localization/Drivers/LocalizedDriver.cs new file mode 100644 index 000000000..8ef5c579f --- /dev/null +++ b/src/Orchard.Web/Core/Localization/Drivers/LocalizedDriver.cs @@ -0,0 +1,9 @@ +using JetBrains.Annotations; +using Orchard.ContentManagement.Drivers; +using Orchard.Core.Localization.Models; + +namespace Orchard.Core.Localization.Drivers { + [UsedImplicitly] + public class LocalizedDriver : ContentPartDriver<Localized> { + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 4b9aad157..28f46941b 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -70,6 +70,7 @@ <Compile Include="Common\Handlers\RoutableAspectHandler.cs" /> <Compile Include="Contents\Controllers\ItemController.cs" /> <Compile Include="Contents\Handlers\ContentsModuleHandler.cs" /> + <Compile Include="Localization\Drivers\LocalizedDriver.cs" /> <Compile Include="Routable\Controllers\ItemController.cs" /> <Compile Include="Routable\Drivers\RoutableDriver.cs" /> <Compile Include="Routable\Handlers\RoutableHandler.cs" /> From 1f03a7120deae4cb8388de2e354eb7ff6c331228 Mon Sep 17 00:00:00 2001 From: Suha Can <Suha.Can@microsoft.com> Date: Tue, 8 Jun 2010 16:25:56 -0700 Subject: [PATCH 63/66] - Changing where we alter type definitions in the setup service so the types can be initialized with the right parts. --HG-- branch : dev --- .../Modules/Orchard.Setup/Services/SetupService.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index c90170629..d8ca32bbe 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -148,6 +148,11 @@ namespace Orchard.Setup.Services { //var hackInstallationGenerator = environment.Resolve<IHackInstallationGenerator>(); //hackInstallationGenerator.GenerateInstallEvents(); + var contentDefinitionManager = environment.Resolve<IContentDefinitionManager>(); + contentDefinitionManager.AlterTypeDefinition("blogpost", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized")); + contentDefinitionManager.AlterTypeDefinition("page", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized")); + contentDefinitionManager.AlterTypeDefinition("sandboxpage", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized")); + // create home page as a CMS page var page = contentManager.Create("page", VersionOptions.Draft); page.As<BodyAspect>().Text = "<p>Welcome to Orchard!</p><p>Congratulations, you've successfully set-up your Orchard site.</p><p>This is the home page of your new site. We've taken the liberty to write here about a few things you could look at next in order to get familiar with the application. Once you feel confident you don't need this anymore, just click <a href=\"Admin/Pages/Edit/3\">Edit</a> to go into edit mode and replace this with whatever you want on your home page to make it your own.</p><p>One thing you could do (but you don't have to) is go into <a href=\"Admin/Settings\">Manage Settings</a> (follow the <a href=\"Admin\">Admin</a> link and then look for it under \"Settings\" in the menu on the left) and check that everything is configured the way you want.</p><p>You probably want to make the site your own. One of the ways you can do that is by clicking <a href=\"Admin/Themes\">Manage Themes</a> in the admin menu. A theme is a packaged look and feel that affects the whole site.</p><p>Next, you can start playing with the content types that we installed. For example, go ahead and click <a href=\"Admin/Pages/Create\">Add New Page</a> in the admin menu and create an \"about\" page. Then, add it to the navigation menu by going to <a href=\"Admin/Navigation\">Manage Menu</a>. You can also click <a href=\"Admin/Blogs/Create\">Add New Blog</a> and start posting by clicking \"Add New Post\".</p><p>Finally, Orchard has been designed to be extended. It comes with a few built-in modules such as pages and blogs or themes. You can install new themes by going to <a href=\"Admin/Themes\">Manage Themes</a> and clicking <a href=\"Admin/Themes/Install\">Install a new Theme</a>. Like for themes, modules are created by other users of Orchard just like you so if you feel up to it, please <a href=\"http://www.orchardproject.net/\">consider participating</a>.</p><p>--The Orchard Crew</p>"; @@ -172,11 +177,6 @@ namespace Orchard.Setup.Services { var authenticationService = environment.Resolve<IAuthenticationService>(); authenticationService.SignIn(user, true); } - - var contentDefinitionManager = environment.Resolve<IContentDefinitionManager>(); - contentDefinitionManager.AlterTypeDefinition("blogpost", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized")); - contentDefinitionManager.AlterTypeDefinition("page", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized")); - contentDefinitionManager.AlterTypeDefinition("sandboxpage", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized")); } catch { environment.Resolve<ITransactionManager>().Cancel(); From ded153660df049559d41ed56677cb4ae8d8cfac8 Mon Sep 17 00:00:00 2001 From: Nathan Heskew <nathan.heskew@microsoft.com> Date: Tue, 8 Jun 2010 16:26:08 -0700 Subject: [PATCH 64/66] Added a little UI to set the default culture for the site (in /admin/settings) --HG-- branch : dev --- src/Orchard.Web/Core/Orchard.Core.csproj | 1 + .../Settings/Controllers/AdminController.cs | 8 ++++++-- .../ViewModels/SettingsIndexViewModel.cs | 12 +++++++++--- .../Core/Settings/Views/Admin/Index.ascx | 17 +++++++++++------ .../Controllers/AdminController.cs | 3 +-- .../Controllers/SearchController.cs | 4 +--- .../Orchard.Search/Models/ISearchResult.cs | 9 --------- .../Orchard.Search/Models/SearchResult.cs | 9 --------- .../Orchard.Search/Orchard.Search.csproj | 2 -- .../Orchard.Search/Services/SearchService.cs | 1 - 10 files changed, 29 insertions(+), 37 deletions(-) delete mode 100644 src/Orchard.Web/Modules/Orchard.Search/Models/ISearchResult.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.Search/Models/SearchResult.cs diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 28f46941b..86497731a 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -47,6 +47,7 @@ <Reference Include="System.ComponentModel.DataAnnotations"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> + <Reference Include="System.Data" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Web.ApplicationServices" /> <Reference Include="System.Web.DynamicData" /> diff --git a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs index 747efb49a..ceaa8e242 100644 --- a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs @@ -3,6 +3,7 @@ using Orchard.Core.Settings.Models; using Orchard.Core.Settings.ViewModels; using Orchard.Localization; using Orchard.ContentManagement; +using Orchard.Localization.Services; using Orchard.Settings; using Orchard.UI.Notify; @@ -10,10 +11,12 @@ namespace Orchard.Core.Settings.Controllers { [ValidateInput(false)] public class AdminController : Controller, IUpdateModel { private readonly ISiteService _siteService; + private readonly ICultureManager _cultureManager; public IOrchardServices Services { get; private set; } - public AdminController(ISiteService siteService, IOrchardServices services) { + public AdminController(ISiteService siteService, IOrchardServices services, ICultureManager cultureManager) { _siteService = siteService; + _cultureManager = cultureManager; Services = services; T = NullLocalizer.Instance; } @@ -25,7 +28,8 @@ namespace Orchard.Core.Settings.Controllers { return new HttpUnauthorizedResult(); var model = new SettingsIndexViewModel { - Site = _siteService.GetSiteSettings().As<SiteSettings>() + Site = _siteService.GetSiteSettings().As<SiteSettings>(), + AvailableCultures = _cultureManager.ListCultures() }; model.ViewModel = Services.ContentManager.BuildEditorModel(model.Site); return View(model); diff --git a/src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs b/src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs index 724487bd8..1e96cdbf5 100644 --- a/src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs +++ b/src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs @@ -1,4 +1,5 @@ -using System.Web.Mvc; +using System.Collections.Generic; +using System.Web.Mvc; using Orchard.ContentManagement; using Orchard.Mvc.ViewModels; using Orchard.Core.Settings.Models; @@ -6,6 +7,7 @@ using Orchard.Core.Settings.Models; namespace Orchard.Core.Settings.ViewModels { public class SettingsIndexViewModel : BaseViewModel { public SiteSettings Site { get; set; } + public IEnumerable<string> AvailableCultures { get; set; } public ContentItemViewModel ViewModel { get; set; } @@ -20,12 +22,16 @@ namespace Orchard.Core.Settings.ViewModels { set { Site.As<SiteSettings>().Record.PageTitleSeparator = value; } } - public string SiteName - { + public string SiteName { get { return Site.As<SiteSettings>().Record.SiteName; } set { Site.As<SiteSettings>().Record.SiteName = value; } } + public string SiteCulture { + get { return Site.As<SiteSettings>().Record.SiteCulture; } + set { Site.As<SiteSettings>().Record.SiteCulture = value; } + } + public string SuperUser { get { return Site.As<SiteSettings>().Record.SuperUser; } set { Site.As<SiteSettings>().Record.SuperUser = value; } diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx index 096432d18..eab74c35a 100644 --- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx @@ -2,21 +2,26 @@ <%@ Import Namespace="Orchard.Core.Settings.ViewModels"%> <h1><%=Html.TitleForPage(T("Manage Settings").ToString())%></h1> <%using (Html.BeginFormAntiForgeryPost()) { %> -<%= Html.ValidationSummary() %> +<%=Html.ValidationSummary() %> <fieldset> - <legend><%=_Encoded("Global Settings")%></legend> + <legend><%:T("Global Settings")%></legend> <div> - <label for="SiteName"><%=_Encoded("Site name") %></label> + <label for="SiteName"><%:T("Site name")%></label> <%=Html.EditorFor(m => m.SiteName)%> <%=Html.ValidationMessage("SiteName", "*") %> </div> <div> - <label for="PageTitleSeparator"><%=_Encoded("Page title separator") %></label> + <label for="SiteCulture"><%:T("Default Site Culture") %></label> + <%=Html.DropDownList("SiteCulture", new SelectList(Model.AvailableCultures, Model.SiteCulture)) %> + <%=Html.ValidationMessage("SiteCulture", "*") %> + </div> + <div> + <label for="PageTitleSeparator"><%:T("Page title separator")%></label> <%=Html.EditorFor(x => x.PageTitleSeparator)%> <%=Html.ValidationMessage("PageTitleSeparator", "*")%> </div> <div> - <label for="SuperUser"><%=_Encoded("Super user") %></label> + <label for="SuperUser"><%:T("Super user")%></label> <%=Html.EditorFor(x=>x.SuperUser) %> <%=Html.ValidationMessage("SuperUser", "*") %> </div> @@ -24,6 +29,6 @@ <%= Html.EditorForItem(Model.ViewModel) %> <fieldset> <%=Html.EditorFor(s => s.Id) %> - <input class="button primaryAction" type="submit" value="<%=_Encoded("Save") %>" /> + <input class="button primaryAction" type="submit" value="<%:T("Save") %>" /> </fieldset> <% } %> diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs index 089d681a4..88ba378be 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs @@ -1,5 +1,4 @@ -using System; -using System.Web.Mvc; +using System.Web.Mvc; using Orchard.Localization; using Orchard.Search.Services; using Orchard.Search.ViewModels; diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs index ba7f8f63d..f7e4d4f98 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using System.Web.Mvc; +using System.Web.Mvc; using Orchard.ContentManagement; using Orchard.Search.Services; using Orchard.Search.ViewModels; diff --git a/src/Orchard.Web/Modules/Orchard.Search/Models/ISearchResult.cs b/src/Orchard.Web/Modules/Orchard.Search/Models/ISearchResult.cs deleted file mode 100644 index 73ecec10e..000000000 --- a/src/Orchard.Web/Modules/Orchard.Search/Models/ISearchResult.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; -using Orchard.Indexing; - -namespace Orchard.Search.Models { - public interface ISearchResult { - IEnumerable<ISearchHit> Page { get; set; } - int TotalCount { get; set; } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchResult.cs b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchResult.cs deleted file mode 100644 index 77f86c7c3..000000000 --- a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchResult.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; -using Orchard.Indexing; - -namespace Orchard.Search.Models { - public class SearchResult : ISearchResult { - public IEnumerable<ISearchHit> Page { get; set; } - public int TotalCount { get; set; } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj index bd2162dbb..5ee797d6f 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -71,9 +71,7 @@ <Compile Include="Filters\SearchFilter.cs" /> <Compile Include="Permissions.cs" /> <Compile Include="Routes.cs" /> - <Compile Include="Models\ISearchResult.cs" /> <Compile Include="Services\ISearchService.cs" /> - <Compile Include="Models\SearchResult.cs" /> <Compile Include="Services\SearchService.cs" /> <Compile Include="ViewModels\SearchIndexViewModel.cs" /> <Compile Include="ViewModels\SearchResultViewModel.cs" /> diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs index 289cd57ba..b76ac33f4 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs @@ -4,7 +4,6 @@ using System.Linq; using Orchard.Collections; using Orchard.Indexing; using Orchard.Localization; -using Orchard.Search.Models; using Orchard.UI.Notify; namespace Orchard.Search.Services From 521b415f884b1e8c157a596821c36bc6e87bfd3e Mon Sep 17 00:00:00 2001 From: Suha Can <Suha.Can@microsoft.com> Date: Tue, 8 Jun 2010 16:56:02 -0700 Subject: [PATCH 65/66] - Adding a method to the CultureManager to return the default site culture (as opposed to current culture) --HG-- branch : dev --- src/Orchard/ContentManagement/ContentField.cs | 6 +----- .../Localization/Services/DefaultCultureManager.cs | 9 ++++++++- src/Orchard/Localization/Services/ICultureManager.cs | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Orchard/ContentManagement/ContentField.cs b/src/Orchard/ContentManagement/ContentField.cs index 953c94953..671ac54fd 100644 --- a/src/Orchard/ContentManagement/ContentField.cs +++ b/src/Orchard/ContentManagement/ContentField.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Orchard.ContentManagement.MetaData.Models; +using Orchard.ContentManagement.MetaData.Models; namespace Orchard.ContentManagement { public class ContentField { diff --git a/src/Orchard/Localization/Services/DefaultCultureManager.cs b/src/Orchard/Localization/Services/DefaultCultureManager.cs index 30e9b3a20..58e6301f8 100644 --- a/src/Orchard/Localization/Services/DefaultCultureManager.cs +++ b/src/Orchard/Localization/Services/DefaultCultureManager.cs @@ -1,11 +1,12 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; using System.Text.RegularExpressions; using System.Web; +using JetBrains.Annotations; using Orchard.Data; using Orchard.Localization.Records; +using Orchard.Settings; namespace Orchard.Localization.Services { public class DefaultCultureManager : ICultureManager { @@ -17,6 +18,8 @@ namespace Orchard.Localization.Services { _cultureSelectors = cultureSelectors; } + protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; } + public IEnumerable<string> ListCultures() { var query = from culture in _cultureRepository.Table select culture.Culture; return query.ToList(); @@ -51,6 +54,10 @@ namespace Orchard.Localization.Services { return _cultureRepository.Get(id); } + public string GetSiteCulture() { + return CurrentSite == null ? null : CurrentSite.SiteCulture; + } + // "<languagecode2>" or // "<languagecode2>-<country/regioncode2>" or // "<languagecode2>-<scripttag>-<country/regioncode2>" diff --git a/src/Orchard/Localization/Services/ICultureManager.cs b/src/Orchard/Localization/Services/ICultureManager.cs index a2864cd3c..5027105d1 100644 --- a/src/Orchard/Localization/Services/ICultureManager.cs +++ b/src/Orchard/Localization/Services/ICultureManager.cs @@ -8,5 +8,6 @@ namespace Orchard.Localization.Services { void AddCulture(string cultureName); string GetCurrentCulture(HttpContext requestContext); CultureRecord GetCultureById(int id); + string GetSiteCulture(); } } From ecabd554289fab95b1dbb73430f654ec2d361f31 Mon Sep 17 00:00:00 2001 From: Sebastien Ros <sebros@microsoft.com> Date: Tue, 8 Jun 2010 17:17:50 -0700 Subject: [PATCH 66/66] Localized content is indexed and searched. During indexation, the culture of the content item is store within the index. If this is the master content item, then the Site's culture is used. When the search query is created, a filter is applied on the current request's culture. --HG-- branch : dev --- .../Core/Localization/Handlers/LocalizedHandler.cs | 3 +++ .../Modules/Orchard.Search/Services/SearchService.cs | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Core/Localization/Handlers/LocalizedHandler.cs b/src/Orchard.Web/Core/Localization/Handlers/LocalizedHandler.cs index 670e0e6f9..9a1ac701e 100644 --- a/src/Orchard.Web/Core/Localization/Handlers/LocalizedHandler.cs +++ b/src/Orchard.Web/Core/Localization/Handlers/LocalizedHandler.cs @@ -5,6 +5,7 @@ using Orchard.Localization; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; using Orchard.Localization.Services; +using Orchard.Settings; namespace Orchard.Core.Localization.Handlers { [UsedImplicitly] @@ -22,6 +23,8 @@ namespace Orchard.Core.Localization.Handlers { OnActivated<Localized>(InitializePart); OnLoaded<Localized>(LazyLoadHandlers); + + OnIndexed<Localized>((context, localized) => context.IndexDocument.Add("culture", localized.Culture != null ? localized.Culture.Culture : _cultureManager.GetSiteCulture()).Store(false).Analyze(false)); } public Localizer T { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs index 289cd57ba..8ee7cab2d 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs @@ -4,8 +4,10 @@ using System.Linq; using Orchard.Collections; using Orchard.Indexing; using Orchard.Localization; +using Orchard.Localization.Services; using Orchard.Search.Models; using Orchard.UI.Notify; +using System.Web; namespace Orchard.Search.Services { @@ -14,11 +16,13 @@ namespace Orchard.Search.Services private const string SearchIndexName = "Search"; private readonly IIndexManager _indexManager; private readonly IEnumerable<IIndexNotifierHandler> _indexNotifierHandlers; + private readonly ICultureManager _cultureManager; - public SearchService(IOrchardServices services, IIndexManager indexManager, IEnumerable<IIndexNotifierHandler> indexNotifierHandlers) { + public SearchService(IOrchardServices services, IIndexManager indexManager, IEnumerable<IIndexNotifierHandler> indexNotifierHandlers, ICultureManager cultureManager) { Services = services; _indexManager = indexManager; _indexNotifierHandlers = indexNotifierHandlers; + _cultureManager = cultureManager; T = NullLocalizer.Instance; } @@ -37,6 +41,10 @@ namespace Orchard.Search.Services .WithField("title", query) .WithField("body", query); + if(HttpContext.Current != null) { + searchBuilder.WithField("culture", _cultureManager.GetCurrentCulture(HttpContext.Current)); + } + var totalCount = searchBuilder.Count(); if (pageSize != null) searchBuilder = searchBuilder