Merge pull request #6107 from sbwalker/dev
rename property to IPortableContext
This commit is contained in:
@@ -559,11 +559,11 @@ namespace Oqtane.Controllers
|
|||||||
module = _modules.AddModule(module);
|
module = _modules.AddModule(module);
|
||||||
|
|
||||||
// deep copy module content (includes settings)
|
// deep copy module content (includes settings)
|
||||||
pm.Module.IPortable = "Copy Page";
|
pm.Module.IPortableContext = "Copy Page";
|
||||||
string content = _modules.ExportModule(pm.Module);
|
string content = _modules.ExportModule(pm.Module);
|
||||||
if (content != "")
|
if (content != "")
|
||||||
{
|
{
|
||||||
module.IPortable = "Copy Page";
|
module.IPortableContext = "Copy Page";
|
||||||
_modules.ImportModule(module, content);
|
_modules.ImportModule(module, content);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ namespace Oqtane.Infrastructure
|
|||||||
// module content
|
// module content
|
||||||
if (globalReplace.Content)
|
if (globalReplace.Content)
|
||||||
{
|
{
|
||||||
pageModule.Module.IPortable = "Global Replace";
|
pageModule.Module.IPortableContext = "Global Replace";
|
||||||
var content = moduleRepository.ExportModule(pageModule.Module);
|
var content = moduleRepository.ExportModule(pageModule.Module);
|
||||||
if (!string.IsNullOrEmpty(content) && content.Contains(WebUtility.HtmlEncode(find), comparisonType))
|
if (!string.IsNullOrEmpty(content) && content.Contains(WebUtility.HtmlEncode(find), comparisonType))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ namespace Oqtane.Repository
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
module.IPortable = "Export Module";
|
module.IPortableContext = "Export Module";
|
||||||
module.Settings = settings.ToDictionary(x => x.SettingName, x => x.SettingValue);
|
module.Settings = settings.ToDictionary(x => x.SettingName, x => x.SettingValue);
|
||||||
var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
|
var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
|
||||||
modulecontent.Content = ((IPortable)moduleobject).ExportModule(module);
|
modulecontent.Content = ((IPortable)moduleobject).ExportModule(module);
|
||||||
@@ -206,7 +206,7 @@ namespace Oqtane.Repository
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
module.IPortable = "Import Module";
|
module.IPortableContext = "Import Module";
|
||||||
module.Settings = _settings.GetSettings(EntityNames.Module, module.ModuleId).ToDictionary(x => x.SettingName, x => x.SettingValue);
|
module.Settings = _settings.GetSettings(EntityNames.Module, module.ModuleId).ToDictionary(x => x.SettingName, x => x.SettingValue);
|
||||||
var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
|
var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
|
||||||
((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version);
|
((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version);
|
||||||
|
|||||||
@@ -535,7 +535,7 @@ namespace Oqtane.Repository
|
|||||||
if (!string.IsNullOrEmpty(pageTemplateModule.Content))
|
if (!string.IsNullOrEmpty(pageTemplateModule.Content))
|
||||||
{
|
{
|
||||||
var module = _moduleRepository.GetModule(pageModule.ModuleId);
|
var module = _moduleRepository.GetModule(pageModule.ModuleId);
|
||||||
module.IPortable = "Site Template";
|
module.IPortableContext = "Site Template";
|
||||||
if (!_moduleRepository.ImportModule(module, pageTemplateModule.Content))
|
if (!_moduleRepository.ImportModule(module, pageTemplateModule.Content))
|
||||||
{
|
{
|
||||||
if (alias != null)
|
if (alias != null)
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ namespace Oqtane.Models
|
|||||||
/// Specifies the scenario where the IPortable interface is being invoked
|
/// Specifies the scenario where the IPortable interface is being invoked
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public string IPortable { get; set; }
|
public string IPortableContext { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reference to the <see cref="ModuleDefinition"/> used for this module.
|
/// Reference to the <see cref="ModuleDefinition"/> used for this module.
|
||||||
|
|||||||
Reference in New Issue
Block a user