Merge pull request #2881 from sbwalker/dev

move logic for populating theme control names
This commit is contained in:
Shaun Walker 2023-06-10 13:35:44 -04:00 committed by GitHub
commit 69456d3569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -130,13 +130,15 @@ namespace Oqtane.Repository
{ {
// override user customizable property values // override user customizable property values
Theme.Name = (!string.IsNullOrEmpty(theme.Name)) ? theme.Name : Theme.Name; Theme.Name = (!string.IsNullOrEmpty(theme.Name)) ? theme.Name : Theme.Name;
// remove theme from list as it is already synced
themes.Remove(theme);
}
// format theme control names
foreach (var themecontrol in Theme.Themes) foreach (var themecontrol in Theme.Themes)
{ {
themecontrol.Name = Theme.Name + " - " + themecontrol.Name; themecontrol.Name = Theme.Name + " - " + themecontrol.Name;
} }
// remove theme from list as it is already synced
themes.Remove(theme);
}
Theme.ThemeId = theme.ThemeId; Theme.ThemeId = theme.ThemeId;
Theme.CreatedBy = theme.CreatedBy; Theme.CreatedBy = theme.CreatedBy;