Merge pull request #2881 from sbwalker/dev
move logic for populating theme control names
This commit is contained in:
commit
69456d3569
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user