Merge pull request #51 from umco/develop

Release 0.3.0

Author: leekelleher

README.md

@@ -39,7 +39,7 @@ If you prefer, you can compile  Doc Type Grid Editor yourself, you'll need:
 
 To clone it locally click the "Clone in Windows" button above or run the following git commands.
 
-	git clone https://github.com/leekelleher/umbraco-doc-type-grid-editor.git umbraco-doc-type-grid-editor
+	git clone https://github.com/umco/umbraco-doc-type-grid-editor.git umbraco-doc-type-grid-editor
 	cd umbraco-doc-type-grid-editor
 	.\build.cmd
 
@@ -60,6 +60,7 @@ Please be aware that not all property-editors will work within Doc Type Grid Edi
 * Upload (default Umbraco core)
 * Image Cropper (default Umbraco core)
 * Macro Container (default Umbraco core)
+* Tags (default Umbraco core)
 
 ---
 
@@ -77,7 +78,7 @@ Anyone and everyone is welcome to contribute. Please take a moment to review the
 Have a question?
 
 * [Doc Type Grid Editor Forum](https://our.umbraco.org/projects/backoffice-extensions/doc-type-grid-editor/doc-type-grid-editor-feedback/) on Our Umbraco
-* [Raise an issue](https://github.com/leekelleher/umbraco-doc-type-grid-editor/issues) on GitHub
+* [Raise an issue](https://github.com/umco/umbraco-doc-type-grid-editor/issues) on GitHub
 
 
 ## Dev Team
@@ -92,6 +93,6 @@ Have a question?
 
 ## License
 
-Copyright © 2015 Umbrella Inc, Our Umbraco and [other contributors](https://github.com/leekelleher/umbraco-doc-type-grid-editor/graphs/contributors)
+Copyright © 2014 Umbrella Inc, Our Umbraco and [other contributors](https://github.com/umco/umbraco-doc-type-grid-editor/graphs/contributors)
 
 Licensed under the [MIT License](LICENSE.md)

appveyor.yml

@@ -1,5 +1,5 @@
 # version format
-version: 0.2.1.{build}
+version: 0.3.0.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

build/package.proj

@@ -30,7 +30,7 @@
 	<!-- NUGET ONLY PROPERTIES -->
 	<PropertyGroup>
 		<PackageId>Our.Umbraco.DocTypeGridEditor</PackageId>
-		<NuGetPackageName>Umbraco Doc Type Grid Editor</NuGetPackageName>
+		<NuGetPackageName>Doc Type Grid Editor for Umbraco</NuGetPackageName>
 		<Copyright>Copyright &#169; 2015 Matt Brailsford, Lee Kelleher</Copyright>
 		<Owners>Matt Brailsford, Lee Kelleher</Owners>
 		<IconUrl>https://our.umbraco.org/media/wiki/145708/635623742802070736_dtgepng.png</IconUrl>

docs/developers-guide.md

@@ -179,5 +179,5 @@ By inheriting from the `DocTypeGridEditorSurfaceController` base class, you'll a
 
 ### Useful Links
 
-* [Source Code](https://github.com/leekelleher/umbraco-doc-type-grid-editor)
+* [Source Code](https://github.com/umco/umbraco-doc-type-grid-editor)
 * [Our Umbraco Project Page](http://our.umbraco.org/projects/backoffice-extensions/doc-type-grid-editor)

src/.nuget/NuGet.targets

@@ -1,15 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.DocTypeGridEditor", "Our.Umbraco.DocTypeGridEditor\Our.Umbraco.DocTypeGridEditor.csproj", "{4BD1DB40-1B39-4966-8740-D6A39D658598}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CEE9961C-D747-40CD-B0B2-868D6B46833E}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{D588B45D-9E67-4136-8271-2B8724C8165F}"
@@ -31,6 +29,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Package", "Build Pack
 		..\build\readme.txt = ..\build\readme.txt
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8412A31B-D80C-42DE-9589-4BD08F43F86B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,4 +45,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{CEE9961C-D747-40CD-B0B2-868D6B46833E} = {8412A31B-D80C-42DE-9589-4BD08F43F86B}
+		{D588B45D-9E67-4136-8271-2B8724C8165F} = {8412A31B-D80C-42DE-9589-4BD08F43F86B}
+		{42CE1449-272B-453B-B162-4558FD38BF41} = {8412A31B-D80C-42DE-9589-4BD08F43F86B}
+	EndGlobalSection
 EndGlobal

src/Our.Umbraco.DocTypeGridEditor.sln

@@ -2,6 +2,8 @@
 using Our.Umbraco.DocTypeGridEditor.Web.Attributes;
 using Our.Umbraco.DocTypeGridEditor.Web.Mvc;
 using Umbraco.Core;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 
 namespace Our.Umbraco.DocTypeGridEditor
@@ -20,7 +22,7 @@ protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplica
             DataTypeService.Saved += ExpireCache;
         }
 
-        private void ExpireCache(IDataTypeService sender, global::Umbraco.Core.Events.SaveEventArgs<global::Umbraco.Core.Models.IDataTypeDefinition> e)
+        private void ExpireCache(IDataTypeService sender, SaveEventArgs<IDataTypeDefinition> e)
         {
             foreach (var dataType in e.SavedEntities)
             {
@@ -29,4 +31,4 @@ private void ExpireCache(IDataTypeService sender, global::Umbraco.Core.Events.Sa
             }
         }
     }
-}
+}

src/Our.Umbraco.DocTypeGridEditor/Bootstrap.cs

@@ -14,4 +14,4 @@ public static string GetAliasByGuid(this IContentTypeService contentTypeService,
                     .ExecuteScalar<string>("SELECT [cmsContentType].[alias] FROM [cmsContentType] INNER JOIN [umbracoNode] ON [cmsContentType].[nodeId] = [umbracoNode].[id] WHERE [umbracoNode].[uniqueID] = @0", id));
         }
     }
-}
+}

src/Our.Umbraco.DocTypeGridEditor/Extensions/ContentTypeServiceExtensions.cs

@@ -5,18 +5,21 @@ namespace Our.Umbraco.DocTypeGridEditor.Extensions
 {
     internal static class ViewEnginesCollectionExtensions
     {
-        public static bool ViewExists(this ViewEngineCollection viewEngines, 
+        public static bool ViewExists(
+            this ViewEngineCollection viewEngines,
             ControllerContext controllerContext,
             string viewName, bool isPartial = false)
         {
             var result = !isPartial
                 ? viewEngines.FindView(controllerContext, viewName, null)
                 : viewEngines.FindPartialView(controllerContext, viewName);
+
             if (result.View != null)
                 return true;
 
-            LogHelper.Warn<Bootstrap>("No view file found with the name " + viewName);
+            LogHelper.Info<ViewEngineCollection>("[DocTypeGridEditor] No view file found with the name '{0}'", () => viewName);
+
             return false;
         }
     }
-}
+}

src/Our.Umbraco.DocTypeGridEditor/Extensions/ViewEnginesCollectionExtensions.cs

@@ -78,7 +78,7 @@ private static IPublishedContent ConvertValue(string id, string contentTypeAlias
                         /* Now that we have the DB stored value, we actually need to then convert it into it's
                          * XML serialized state as expected by the published property by calling ConvertDbToString
                          */
-                        var propType2 = contentType.CompositionPropertyTypes.Single(x => x.Alias == propType.PropertyTypeAlias);
+                        var propType2 = contentType.CompositionPropertyTypes.Single(x => x.Alias.InvariantEquals(propType.PropertyTypeAlias));
 
                         Property prop2 = null;
                         try
@@ -93,7 +93,7 @@ private static IPublishedContent ConvertValue(string id, string contentTypeAlias
                         }
                         catch(Exception ex)
                         {
-                            LogHelper.Error<DocTypeGridEditorHelper>("Error creating Property object.", ex);
+                            LogHelper.Error<DocTypeGridEditorHelper>("[DocTypeGridEditor] Error creating Property object.", ex);
                         }
 
                         if (prop2 != null)

src/Our.Umbraco.DocTypeGridEditor/Helpers/DocTypeGridEditorHelper.cs

@@ -27,7 +27,5 @@ public static T GetAttributeValueFromNode<T>(XmlNode node, string attributeName,
             }
             return defaultValue;
         }
-
-
     }
-}
+}

src/Our.Umbraco.DocTypeGridEditor/Helpers/XmlHelper.cs

@@ -152,4 +152,4 @@ public override int Level
             get { return 0; }
         }
     }
-}
+}

src/Our.Umbraco.DocTypeGridEditor/Models/DetachedPublishedContent.cs

@@ -29,20 +29,32 @@ public DetachedPublishedProperty(PublishedPropertyType propertyType, object valu
             _xpathValue = new Lazy<object>(() => _propertyType.ConvertSourceToXPath(_sourceValue.Value, _isPreview));
         }
 
-        public string PropertyTypeAlias {
+        public string PropertyTypeAlias
+        {
             get
             {
                 return _propertyType.PropertyTypeAlias;
             }
         }
 
-        public bool HasValue 
+        public bool HasValue
         {
             get { return DataValue != null && DataValue.ToString().Trim().Length > 0; }
         }
 
-        public object DataValue { get { return _rawValue; } }
-        public object Value { get { return _objectValue.Value; } }
-        public object XPathValue { get { return _xpathValue.Value; } }
+        public object DataValue
+        {
+            get { return _rawValue; }
+        }
+
+        public object Value
+        {
+            get { return _objectValue.Value; }
+        }
+
+        public object XPathValue
+        {
+            get { return _xpathValue.Value; }
+        }
     }
-}
+}