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

updates permission tree

Browse Source 
[TFS Changeset #70542]
This commit is contained in:
Shandem
2010-06-21 15:24:35 +00:00
parent 90d9bd0860
commit 2db0daf773
3 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
umbraco/cms/businesslogic/Permission.cs
View File

@@ -114,6 +114,23 @@ namespace umbraco.BusinessLogic
SqlHelper.CreateParameter("@userId", user.Id));
}
public static void DeletePermissions(int iUserID, int[] iNodeIDs)
{
string sql = "DELETE FROM umbracoUser2NodePermission WHERE nodeID IN ({0}) AND userID=@userID";
string nodeIDs = string.Join(",", Array.ConvertAll<int, string>(iNodeIDs, Converter));
sql = string.Format(sql, nodeIDs);
SqlHelper.ExecuteNonQuery(sql,
new IParameter[] { SqlHelper.CreateParameter("@userID", iUserID) });
}
public static void DeletePermissions(int iUserID, int iNodeID)
{
DeletePermissions(iUserID, new int[] { iNodeID });
}
private static string Converter(int from)
{
return from.ToString();
}
/// <summary>
/// delete all permissions for this node
/// </summary>

2
umbraco/presentation/umbraco/Trees/UserPermissions.cs
View File

@@ -45,7 +45,7 @@ namespace umbraco.cms.presentation.Trees
{
foreach (umbraco.BusinessLogic.User user in umbraco.BusinessLogic.User.getAll())
{
if (user.Id > 0)
if (user.Id > 0 && !user.Disabled)
{
XmlTreeNode node = XmlTreeNode.Create(this);
node.NodeID = user.Id.ToString();

29
umbraco/presentation/umbraco/users/UserPermissions.cs
View File

@@ -14,7 +14,6 @@ using umbraco.BusinessLogic.Actions;
using umbraco.DataLayer;
using umbraco.cms.businesslogic;
using umbraco.interfaces;
using System.Xml.XPath;
using umbraco.BasePages;
using umbraco.cms.businesslogic.web;
@@ -22,12 +21,7 @@ namespace umbraco.cms.presentation.user
{
/// <summary>
/// Provides umbraco user permission functionality on various nodes. Only nodes that are published are queried via the cache.
/// </summary>
/// <remarks>
/// Uses the Umbraco API for the majority of operations, however, there is 1 manual SQL operation performed since using the Umbraco API to perform these
/// tasks would have been very database intensive. Also, there are quite a few XPath queries on the Umbraco cache file since using the Umbraco API to look up
/// these values would also have been very database intensive.
/// </remarks>
/// </summary>
public class UserPermissions
{
@@ -87,7 +81,7 @@ namespace umbraco.cms.presentation.user
allNodes.AddRange(nodeIDs);
//First remove all permissions for all nodes in question
DeletePermissions(m_user.Id, allNodes.ToArray());
Permission.DeletePermissions(m_user.Id, allNodes.ToArray());
//if permissions are to be assigned, then assign them
if (permissions.Count > 0)
@@ -172,24 +166,7 @@ namespace umbraco.cms.presentation.user
Permission.MakeNew(m_user, node, permission.Letter);
}
private static void DeletePermissions(int iUserID, int iNodeID)
{
DeletePermissions(iUserID, new int[] { iNodeID });
}
private static void DeletePermissions(int iUserID, int[] iNodeIDs)
{
string sql = "DELETE FROM umbracoUser2NodePermission WHERE nodeID IN ({0}) AND userID=@userID";
string nodeIDs = string.Join(",", Array.ConvertAll<int, string>(iNodeIDs, Converter));
sql = string.Format(sql, nodeIDs);
SqlHelper.ExecuteNonQuery(sql,
new IParameter[] { SqlHelper.CreateParameter("@userID", iUserID) });
}
private static string Converter(int from)
{
return from.ToString();
}
}
}