Merge pull request umbraco#527 from designagencytom/patch-4

Shazwazza · Shazwazza · commit a5240a852e23 · 2014-11-13T10:46:58.000+11:00
Flip ternary to prevent defaults being overridden from false to true.
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -63,8 +63,8 @@ function contentPickerController($scope, dialogService, entityResource, editorSt
     }
 
     //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!
-    $scope.model.config.multiPicker = ($scope.model.config.multiPicker === "0" ? false : true);
-    $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "0" ? false : true);
+    $scope.model.config.multiPicker = ($scope.model.config.multiPicker === "1" ? true : false);
+    $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "1" ? true : false);
 
     var entityType = $scope.model.config.startNode.type === "member"
         ? "Member"
@@ -186,4 +186,4 @@ function contentPickerController($scope, dialogService, entityResource, editorSt
     });
 }
 
-angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentPickerController", contentPickerController);
+angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentPickerController", contentPickerController);

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ function contentPickerController($scope, dialogService, entityResource, editorSt`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`//Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!`
`66`		`- $scope.model.config.multiPicker = ($scope.model.config.multiPicker === "0" ? false : true);`
`67`		`- $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "0" ? false : true);`
	`66`	`+ $scope.model.config.multiPicker = ($scope.model.config.multiPicker === "1" ? true : false);`
	`67`	`+ $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "1" ? true : false);`
`68`	`68`
`69`	`69`	`var entityType = $scope.model.config.startNode.type === "member"`
`70`	`70`	`? "Member"`
`@@ -186,4 +186,4 @@ function contentPickerController($scope, dialogService, entityResource, editorSt`
`186`	`186`	`});`
`187`	`187`	`}`
`188`	`188`
`189`		`-angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentPickerController", contentPickerController);`
	`189`	`+angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentPickerController", contentPickerController);`