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

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

Browse Source
This commit is contained in:
Shannon
2013-11-14 20:32:26 +11:00
parent 9eb9b8df92 fc8496dd95
commit d79110aee6
1 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/Umbraco.Web/Editors/DashboardController.cs
View File

@@ -19,58 +19,53 @@ namespace Umbraco.Web.Editors
public IEnumerable<Tab<DashboardControl>> GetDashboard(string section) public IEnumerable<Tab<DashboardControl>> GetDashboard(string section)
{ {
var tabs = new List<Tab<DashboardControl>>(); var tabs = new List<Tab<DashboardControl>>();
var dashboardSection = UmbracoConfig.For.DashboardSettings()
.Sections.FirstOrDefault(x => x.Areas.Contains(section));
//if we cannot find it for whatever reason just return an empty one.
if (dashboardSection == null)
{
return tabs;
}
//we need to validate access to this section
if (DashboardSecurity.AuthorizeAccess(dashboardSection, Security.CurrentUser, Services.SectionService) == false)
{
//return empty collection
return tabs;
}
var i = 1; var i = 1;
foreach (var dashTab in dashboardSection.Tabs)
// The dashboard config can contain more than one area inserted by a package.
foreach( var dashboardSection in UmbracoConfig.For.DashboardSettings().Sections.Where(x => x.Areas.Contains(section)))
{ {
//we need to validate access to this tab //we need to validate access to this section
if (DashboardSecurity.AuthorizeAccess(dashTab, Security.CurrentUser, Services.SectionService)) if (DashboardSecurity.AuthorizeAccess(dashboardSection, Security.CurrentUser, Services.SectionService))
{ {
var props = new List<DashboardControl>(); //User is authorized
foreach (var dashTab in dashboardSection.Tabs)
foreach (var dashCtrl in dashTab.Controls)
{ {
if (DashboardSecurity.AuthorizeAccess(dashCtrl, Security.CurrentUser, Services.SectionService)) //we need to validate access to this tab
if (DashboardSecurity.AuthorizeAccess(dashTab, Security.CurrentUser, Services.SectionService))
{ {
var ctrl = new DashboardControl(); var props = new List<DashboardControl>();
var controlPath = dashCtrl.ControlPath.Trim(' ', '\r', '\n');
ctrl.Path = IOHelper.FindFile(controlPath); foreach (var dashCtrl in dashTab.Controls)
if (controlPath.ToLower().EndsWith(".ascx"))
{ {
ctrl.ServerSide = true; if (DashboardSecurity.AuthorizeAccess(dashCtrl, Security.CurrentUser,
Services.SectionService))
{
var ctrl = new DashboardControl();
var controlPath = dashCtrl.ControlPath.Trim(' ', '\r', '\n');
ctrl.Path = IOHelper.FindFile(controlPath);
if (controlPath.ToLower().EndsWith(".ascx"))
{
ctrl.ServerSide = true;
}
props.Add(ctrl);
}
} }
props.Add(ctrl);
tabs.Add(new Tab<DashboardControl>
{
Id = i,
Alias = dashTab.Caption.ToSafeAlias(),
IsActive = i == 1,
Label = dashTab.Caption,
Properties = props
});
i++;
} }
} }
tabs.Add(new Tab<DashboardControl>
{
Id = i,
Alias = dashTab.Caption.ToSafeAlias(),
IsActive = i == 1,
Label = dashTab.Caption,
Properties = props
});
i++;
} }
} }
//In case there are no tabs or a user doesn't have access the empty tabs list is returned
return tabs; return tabs;
} }