Merge branch 'dev-v7' into dev-v7-centralizedloadbalancing

Shazwazza · Shazwazza · commit 516ae5fdade1 · 2014-12-24T12:18:13.000+11:00
diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -100,8 +100,19 @@ public void AddFile(string path, Stream stream, bool overrideIfExists)
             if (stream.CanSeek)
                 stream.Seek(0, 0);
 
-            using (var destination = (Stream)File.Create(GetFullPath(fsRelativePath)))
-                stream.CopyTo(destination);
+            using (var memoryStream = new MemoryStream())
+            {
+                //Add the BOM
+                var bom = new byte[] { 0xEF, 0xBB, 0xBF };
+                memoryStream.Write(bom, 0, bom.Length);
+                stream.CopyTo(memoryStream);
+
+                if (memoryStream.CanSeek)
+                    memoryStream.Seek(0, 0);
+
+                using (var destination = (Stream)File.Create(GetFullPath(fsRelativePath)))
+                    memoryStream.CopyTo(destination);
+            }
         }
 
         public IEnumerable<string> GetFiles(string path)
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -389,7 +389,7 @@ angular.module("umbraco")
         };
 
         $scope.percentage = function(spans){
-            return ((spans/12)*100).toFixed(1);
+            return (( spans/ $scope.model.config.items.columns ) *100).toFixed(1);
         };
 
 
@@ -399,6 +399,7 @@ angular.module("umbraco")
 
 
 
+
         // *********************************************
         // INITIALISATION
         // these methods are called from ng-init on the template
@@ -419,6 +420,13 @@ angular.module("umbraco")
                 $scope.hasSettings = true;
             }
 
+            //ensure the grid has a column value set, if nothing is found, set it to 12
+            if($scope.model.config.items.columns && angular.isString($scope.model.config.items.columns)){
+                $scope.model.config.items.columns = parseInt($scope.model.config.items.columns);
+            }else{
+                $scope.model.config.items.columns = 12;
+            }
+
             if ($scope.model.value && $scope.model.value.sections && $scope.model.value.sections.length > 0) {
                 _.forEach($scope.model.value.sections, function(section, index){
 
diff --git a/src/umbraco.cms/businesslogic/web/Access.cs b/src/umbraco.cms/businesslogic/web/Access.cs
@@ -494,7 +494,14 @@ public static bool HasAccess(int DocumentId, member.Member Member)
             return hasAccess;
         }
 
+        [Obsolete("This method has been replaced because of a spelling mistake. Use the HasAccess method instead.", false)]
         public static bool HasAccces(int documentId, object memberId)
+        {
+            // Call the correctly named version of this method
+            return HasAccess(documentId, memberId);
+        }
+
+        public static bool HasAccess(int documentId, object memberId)
         {
             bool hasAccess = false;
             var node = new CMSNode(documentId);
@@ -511,7 +518,7 @@ public static bool HasAccces(int documentId, object memberId)
 
                 if (member != null)
                 {
-                    foreach (string role in Roles.GetRolesForUser())
+                    foreach (string role in Roles.GetRolesForUser(member.UserName))
                     {
                         if (currentNode.SelectSingleNode("./group [@id='" + role + "']") != null)
                         {
diff --git a/src/umbraco.sln b/src/umbraco.sln
@@ -55,6 +55,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.Client", "ht
 		Release.AspNetCompiler.Debug = "False"
 		SlnRelativePath = "Umbraco.Web.UI.Client\"
 		DefaultWebSiteLanguage = "Visual C#"
+		StartServerOnDebug = "false"
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web", "Umbraco.Web\Umbraco.Web.csproj", "{651E1350-91B6-44B7-BD60-7207006D7003}"

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,14 @@ public static bool HasAccess(int DocumentId, member.Member Member)`
`494`	`494`	`return hasAccess;`
`495`	`495`	`}`
`496`	`496`
	`497`	`+ [Obsolete("This method has been replaced because of a spelling mistake. Use the HasAccess method instead.", false)]`
`497`	`498`	`public static bool HasAccces(int documentId, object memberId)`
	`499`	`+ {`
	`500`	`+ // Call the correctly named version of this method`
	`501`	`+ return HasAccess(documentId, memberId);`
	`502`	`+ }`
	`503`	`+`
	`504`	`+ public static bool HasAccess(int documentId, object memberId)`
`498`	`505`	`{`
`499`	`506`	`bool hasAccess = false;`
`500`	`507`	`var node = new CMSNode(documentId);`
`@@ -511,7 +518,7 @@ public static bool HasAccces(int documentId, object memberId)`
`511`	`518`
`512`	`519`	`if (member != null)`
`513`	`520`	`{`
`514`		`- foreach (string role in Roles.GetRolesForUser())`
	`521`	`+ foreach (string role in Roles.GetRolesForUser(member.UserName))`
`515`	`522`	`{`
`516`	`523`	`if (currentNode.SelectSingleNode("./group [@id='" + role + "']") != null)`
`517`	`524`	`{`