fixes filtering issue

Shazwazza · Shazwazza · commit 22c615a64111 · 2013-11-21T10:39:10.000+11:00
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingContentAttribute.cs
@@ -44,6 +44,16 @@ protected override void FilterItems(IUser user, IList items)
             FilterBasedOnPermissions(items, user, ApplicationContext.Current.Services.UserService);
         }
 
+        protected override int GetUserStartNode(IUser user)
+        {
+            return user.StartContentId;
+        }
+
+        protected override int RecycleBinId
+        {
+            get { return Constants.System.RecycleBinContent; }
+        }
+
         internal void FilterBasedOnPermissions(IList items, IUser user, IUserService userService)
         {
             var length = items.Count;
diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
@@ -39,6 +39,16 @@ public override bool AllowMultiple
             get { return true; }
         }
 
+        protected virtual int GetUserStartNode(IUser user)
+        {
+            return user.StartMediaId;
+        }
+
+        protected virtual int RecycleBinId
+        {
+            get { return Constants.System.RecycleBinMedia; }
+        }
+
         public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)
         {
             var user = UmbracoContext.Current.Security.CurrentUser;
@@ -77,7 +87,7 @@ internal void FilterBasedOnStartNode(IList items, IUser user)
             var toRemove = new List<dynamic>();
             foreach (dynamic item in items)
             {
-                var hasPathAccess = (item != null && UserExtensions.HasPathAccess(item.Path, user.StartMediaId, Constants.System.RecycleBinMedia));
+                var hasPathAccess = (item != null && UserExtensions.HasPathAccess(item.Path, GetUserStartNode(user), RecycleBinId));
                 if (!hasPathAccess)
                 {
                     toRemove.Add(item);

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,16 @@ public override bool AllowMultiple`
`39`	`39`	`get { return true; }`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ protected virtual int GetUserStartNode(IUser user)`
	`43`	`+ {`
	`44`	`+ return user.StartMediaId;`
	`45`	`+ }`
	`46`	`+`
	`47`	`+ protected virtual int RecycleBinId`
	`48`	`+ {`
	`49`	`+ get { return Constants.System.RecycleBinMedia; }`
	`50`	`+ }`
	`51`	`+`
`42`	`52`	`public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)`
`43`	`53`	`{`
`44`	`54`	`var user = UmbracoContext.Current.Security.CurrentUser;`
`@@ -77,7 +87,7 @@ internal void FilterBasedOnStartNode(IList items, IUser user)`
`77`	`87`	`var toRemove = new List<dynamic>();`
`78`	`88`	`foreach (dynamic item in items)`
`79`	`89`	`{`
`80`		`- var hasPathAccess = (item != null && UserExtensions.HasPathAccess(item.Path, user.StartMediaId, Constants.System.RecycleBinMedia));`
	`90`	`+ var hasPathAccess = (item != null && UserExtensions.HasPathAccess(item.Path, GetUserStartNode(user), RecycleBinId));`
`81`	`91`	`if (!hasPathAccess)`
`82`	`92`	`{`
`83`	`93`	`toRemove.Add(item);`