ability to specify Resources in IModule and ITheme interfaces,, fixed module settings for personalized pages

This commit is contained in:
sbwalker
2023-05-19 18:08:15 -04:00
parent 2be48c3847
commit e41d9008b3
11 changed files with 506 additions and 446 deletions

View File

@ -34,6 +34,7 @@ namespace Oqtane.Models
PackageName = "";
Runtimes = "";
Template = "";
Resources = null;
}
/// <summary>
@ -106,6 +107,9 @@ namespace Oqtane.Models
[NotMapped]
public string PackageName { get; set; } // added in 2.1.0
[NotMapped]
public List<Resource> Resources { get; set; } // added in 4.0.0
// internal properties
[NotMapped]
public int SiteId { get; set; }

View File

@ -23,7 +23,7 @@ namespace Oqtane.Models
get => _url;
set
{
_url = (value.Contains("://")) ? value : (!value.StartsWith("/") ? "/" : "") + value;
_url = (value.Contains("://")) ? value : (!value.StartsWith("/") && !value.StartsWith("~") ? "/" : "") + value;
}
}

View File

@ -105,6 +105,9 @@ namespace Oqtane.Models
[NotMapped]
public List<Language> Languages { get; set; }
[NotMapped]
public List<Theme> Themes { get; set; }
#region IDeletable Properties
public string DeletedBy { get; set; }

View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
namespace Oqtane.Models
{
@ -21,6 +22,7 @@ namespace Oqtane.Models
ThemeSettingsType = "";
ContainerSettingsType = "";
PackageName = "";
Resources = null;
}
/// <summary>
@ -67,6 +69,8 @@ namespace Oqtane.Models
public string ThemeSettingsType { get; set; } // added in 2.0.2
public string ContainerSettingsType { get; set; } // added in 2.0.2
public string PackageName { get; set; } // added in 2.1.0
public List<Resource> Resources { get; set; } // added in 4.0.0
// internal properties
public string AssemblyName { get; set; }