yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp-U4-11150' of https://github.com/dawoe/Umbraco-CMS into dawoe-temp-U4-11150

Browse Source
This commit is contained in:
Sebastiaan Janssen
2018-04-15 22:15:36 +02:00
parent 7571949ad0 36d6b6a254
commit 23fcb38d69
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/Editors/TourController.cs
View File

@@ -123,7 +123,8 @@ namespace Umbraco.Web.Editors
FileName = Path.GetFileNameWithoutExtension(tourFile),
PluginName = pluginName,
Tours = tours
.Where(x => aliasFilters.Count == 0 || aliasFilters.All(filter => filter.IsMatch(x.Alias)) == false)
.Where(x => (aliasFilters.Count == 0 || aliasFilters.All(filter => filter.IsMatch(x.Alias)) == false)
&& (x.Culture == null || string.IsNullOrEmpty(x.Culture) || x.Culture.Equals(Security.CurrentUser.Language, StringComparison.InvariantCultureIgnoreCase)))
.ToArray()
};

5
src/Umbraco.Web/Models/BackOfficeTour.cs
View File

@@ -11,7 +11,7 @@ namespace Umbraco.Web.Models
{
public BackOfficeTour()
{
RequiredSections = new List<string>();
RequiredSections = new List<string>();
}
[DataMember(Name = "name")]
@@ -28,5 +28,8 @@ namespace Umbraco.Web.Models
public List<string> RequiredSections { get; set; }
[DataMember(Name = "steps")]
public BackOfficeTourStep[] Steps { get; set; }
[DataMember(Name = "culture")]
public string Culture { get; set; }
}
}