Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-web/src/main/webapp/app/common/controls/add-exist-organization-modal/add-exist-organization-modal.ctrl.js

@@ -108,7 +108,7 @@ controller('addExistOrganizationModalController', ['$scope', '$log', '$translate
                     mode: "virtual"
                 },
                 keyExpr: "id",
-                parentIdExpr: "parentID",
+                // parentIdExpr: "parentID",
                 selection: {
                     mode: "multiple",
                     showCheckBoxesMode: "always",

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -7,7 +7,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
         $scope.pleaseSelect = $translate.instant('PleaseSelect');
         $scope.startDate = new Date(new Date().getFullYear() - 20, 1, 1);
         $scope.endDate = new Date(new Date().getFullYear() + 20, 1, 1);
-        $scope.viewMode = days;
+        $scope.viewMode = 'days';
 
         var defaultSelcectRegion = {
             id: 0,