Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -309,15 +309,15 @@ define([ 'app/app' ], function(app) {
 				if($scope.searchType.brand) {
 					SessionService.set('brand', true);
 					SessionService.unset('component');
-					window.location.href = 'search?w=' + encodeURI(encodeURIComponent($scope.keyword)) + '&type=brand';
+					window.location.href = 'search?w=' + encodeURI($scope.keyword) + '&type=brand';
 				}else if($scope.searchType.isCmp()){
 					SessionService.set('component', angular.toJson($scope.searchType));
 					SessionService.unset('brand');
-					window.location.href = 'search?w=' + encodeURI(encodeURIComponent($scope.keyword)) + '&type=component';
+					window.location.href = 'search?w=' + encodeURI($scope.keyword) + '&type=component';
 				}else {
 					SessionService.unset('component');
 					SessionService.unset('brand');
-					window.location.href = 'search?w=' + encodeURI(encodeURIComponent($scope.keyword)) + '&type=all';
+					window.location.href = 'search?w=' + encodeURI($scope.keyword) + '&type=all';
 				}
 
 			}