lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-24 13:33:34 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#16893: Publishing and setting localization culture after updateeditor to avoid wrongly overwritting the values.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-11-30 15:00:21 -08:00
parent de4103dc89
commit 1f98c41f54
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
View File

@@ -111,13 +111,7 @@ namespace Orchard.Localization.Controllers {
contentItemTranslation.As<ICommonPart>().Container = contentItem.As<ICommonPart>().Container; contentItemTranslation.As<ICommonPart>().Container = contentItem.As<ICommonPart>().Container;
} }
var localized = contentItemTranslation.As<LocalizationPart>();
localized.MasterContentItem = contentItem;
if (!string.IsNullOrWhiteSpace(model.SelectedCulture))
localized.Culture = _cultureManager.GetCultureByName(model.SelectedCulture);
_contentManager.Create(contentItemTranslation, VersionOptions.Draft); _contentManager.Create(contentItemTranslation, VersionOptions.Draft);
conditionallyPublish(contentItemTranslation);
} }
model.Content = _contentManager.UpdateEditor(contentItemTranslation, this); model.Content = _contentManager.UpdateEditor(contentItemTranslation, this);
@@ -134,6 +128,14 @@ namespace Orchard.Localization.Controllers {
Services.Notifier.Information(T("Edited content item translation.")); Services.Notifier.Information(T("Edited content item translation."));
} }
else { else {
LocalizationPart localized = contentItemTranslation.As<LocalizationPart>();
localized.MasterContentItem = contentItem;
if (!string.IsNullOrWhiteSpace(model.SelectedCulture)) {
localized.Culture = _cultureManager.GetCultureByName(model.SelectedCulture);
}
conditionallyPublish(contentItemTranslation);
Services.Notifier.Information(T("Created content item translation.")); Services.Notifier.Information(T("Created content item translation."));
} }