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

Work items 30127

Browse Source
This commit is contained in:
hartvig
2011-04-18 17:43:23 -02:00
parent 2fad45f972
commit ae18fcda1a
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
umbraco/businesslogic/BasePages/BasePage.cs
View File

@@ -151,6 +151,8 @@ namespace umbraco.BasePages {
if (timeout > DateTime.Now.Ticks) {
return true;
} else {
// clear the usercontext id to prevent continuous logout entries
BasePage.umbracoUserContextID = String.Empty;
BusinessLogic.Log.Add(BusinessLogic.LogTypes.Logout, BusinessLogic.User.GetUser(uid), -1, "");
return false;

15
umbraco/presentation/umbraco/Trees/loadContent.cs
View File

@@ -78,10 +78,17 @@ namespace umbraco
}
else
{
///add the default actions to the content tree
actions.Add(ActionNew.Instance);
actions.Add(ActionSort.Instance);
actions.Add(ContextMenuSeperator.Instance);
// we need to get the default permissions as you can't set permissions on the very root node
List<IAction> nodeActions = Action.FromString(CurrentUser.GetPermissions("-1"));
List<IAction> allowedRootActions = new List<IAction>();
allowedRootActions.Add(ActionNew.Instance);
allowedRootActions.Add(ActionSort.Instance);
List<IAction> allowedMenu = GetUserAllowedActions(allowedRootActions, nodeActions);
actions.AddRange(allowedMenu);
if (allowedMenu.Count > 0 )
actions.Add(ContextMenuSeperator.Instance);
// default actions for all users
actions.Add(ActionRePublish.Instance);
actions.Add(ContextMenuSeperator.Instance);
actions.Add(ActionRefresh.Instance);