Skip to content

Commit eb9ca7d

Browse files
committed
#127 fleshed out helper method - uQuery database call no longer made
1 parent 1ca5d61 commit eb9ca7d

File tree

1 file changed

+38
-6
lines changed

1 file changed

+38
-6
lines changed

source/nuPickers/Helper.cs

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Web;
1010
using System.Web.Hosting;
1111
using umbraco;
12+
using Umbraco.Web;
1213

1314
internal static class Helper
1415
{
@@ -129,16 +130,47 @@ internal static string GetDataFromUrl(string url)
129130
}
130131

131132
/// <summary>
132-
/// replacement for built-in uQuery method (as that hits the database)
133+
/// temp replacement for built-in uQuery method (as that hits the database)
133134
/// </summary>
134-
/// <param name="id"></param>
135-
/// <returns></returns>
135+
/// <param name="id">the id of a content, media or member item</param>
136+
/// <returns>an enum instance of the UmbracoObjectType</returns>
136137
internal static uQuery.UmbracoObjectType GetUmbracoObjectType(int id)
137138
{
138-
// TODO:
139+
// return variable
140+
uQuery.UmbracoObjectType umbracoObjectType = uQuery.UmbracoObjectType.Unknown;
139141

140-
// HACK: returning uQuery call, to prevent breaking
141-
return uQuery.GetUmbracoObjectType(id);
142+
UmbracoHelper umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
143+
144+
// attempt to get content
145+
if (umbracoHelper.TypedContent(id) != null)
146+
{
147+
umbracoObjectType = uQuery.UmbracoObjectType.Document;
148+
}
149+
else
150+
{
151+
// attempt to get media
152+
if(umbracoHelper.TypedMedia(id) != null)
153+
{
154+
umbracoObjectType = uQuery.UmbracoObjectType.Media;
155+
}
156+
else
157+
{
158+
// attempt to get member
159+
try
160+
{
161+
if (umbracoHelper.TypedMember(id) != null)
162+
{
163+
umbracoObjectType = uQuery.UmbracoObjectType.Member;
164+
}
165+
}
166+
catch
167+
{
168+
// HACK: suppress Umbraco error
169+
}
170+
}
171+
}
172+
173+
return umbracoObjectType;
142174
}
143175
}
144176
}

0 commit comments

Comments
 (0)