MAGETWO-33669: Contribution of Sprint 23 Work to Mainline

Safwan Khan · Safwan Khan · commit 3c2555360c88 · 2015-02-18T13:06:34.000-06:00
- Fixed HTTPS population merge error.
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
@@ -68,6 +68,10 @@ angular.module('web-configuration', ['ngStorage'])
             }
         });
 
+        $scope.populateHttps = function() {
+            $scope.config.https.text = $scope.config.address.base_url.replace('http', 'https');
+        };
+
         $scope.showEncryptKey = function() {
             return angular.equals($scope.config.encrypt.type, 'user');
         }

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,10 @@ angular.module('web-configuration', ['ngStorage'])`
`68`	`68`	`}`
`69`	`69`	`});`
`70`	`70`
	`71`	`+ $scope.populateHttps = function() {`
	`72`	`+ $scope.config.https.text = $scope.config.address.base_url.replace('http', 'https');`
	`73`	`+ };`
	`74`	`+`
`71`	`75`	`$scope.showEncryptKey = function() {`
`72`	`76`	`return angular.equals($scope.config.encrypt.type, 'user');`
`73`	`77`	`}`