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

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Bertrand Le Roy
2012-09-27 11:16:48 -07:00
parent 1cdfcba76a a0b9b2823f
commit 4fdb31d80d
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Localization/Views/Admin/Translate.cshtml
View File

@@ -16,7 +16,7 @@
//<![CDATA[ //<![CDATA[
(function ($) { (function ($) {
// grab the slug input // grab the slug input
var slug = $("#Routable_Slug"); var slug = $("#Autoroute_CurrentUrl");
if (slug) { if (slug) {
// grab the current culture // grab the current culture
var culture = $("#SelectedCulture"); var culture = $("#SelectedCulture");

2
src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
View File

@@ -318,7 +318,7 @@ namespace Orchard.Widgets.Controllers {
[HttpPost, ActionName("EditWidget")] [HttpPost, ActionName("EditWidget")]
[FormValueRequired("submit.Save")] [FormValueRequired("submit.Save")]
public ActionResult EditWidgetSavePOST(int id, int layerId, string returnUrl) { public ActionResult EditWidgetSavePOST(int id, [Bind(Prefix = "WidgetPart.LayerId")] int layerId, string returnUrl) {
if (!IsAuthorizedToManageWidgets()) if (!IsAuthorizedToManageWidgets())
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();

6
src/Orchard/ContentManagement/DefaultContentQuery.cs
View File

@@ -16,14 +16,12 @@ using Orchard.Utility.Extensions;
namespace Orchard.ContentManagement { namespace Orchard.ContentManagement {
public class DefaultContentQuery : IContentQuery { public class DefaultContentQuery : IContentQuery {
private readonly ISessionLocator _sessionLocator; private readonly ISessionLocator _sessionLocator;
private readonly ShellSettings _shellSettings;
private ISession _session; private ISession _session;
private ICriteria _itemVersionCriteria; private ICriteria _itemVersionCriteria;
private VersionOptions _versionOptions; private VersionOptions _versionOptions;
public DefaultContentQuery(IContentManager contentManager, ISessionLocator sessionLocator, ShellSettings shellSettings) { public DefaultContentQuery(IContentManager contentManager, ISessionLocator sessionLocator) {
_sessionLocator = sessionLocator; _sessionLocator = sessionLocator;
_shellSettings = shellSettings;
ContentManager = contentManager; ContentManager = contentManager;
} }
@@ -54,7 +52,7 @@ namespace Orchard.ContentManagement {
ICriteria BindItemVersionCriteria() { ICriteria BindItemVersionCriteria() {
if (_itemVersionCriteria == null) { if (_itemVersionCriteria == null) {
_itemVersionCriteria = BindSession().CreateCriteria<ContentItemVersionRecord>(); _itemVersionCriteria = BindSession().CreateCriteria<ContentItemVersionRecord>();
_itemVersionCriteria.SetCacheable(true).SetCacheRegion(_shellSettings.Name); _itemVersionCriteria.SetCacheable(true);
} }
return _itemVersionCriteria; return _itemVersionCriteria;
} }