Commit d5ae9aa16d1e4ff59663fbd31db3a35aceda3717
Merge branch 'Bug#9354_1' into Develop
Showing
1 changed file
with
13 additions
and
0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -5912,6 +5912,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5912,6 +5912,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5912 | 5912 | ||
5913 | $rootScope.isGenderChnage = true; | 5913 | $rootScope.isGenderChnage = true; |
5914 | 5914 | ||
5915 | + | ||
5916 | + if ($rootScope.isExtract == true) { | ||
5917 | + $rootScope.isExtract = false; | ||
5918 | + $rootScope.isHighLight = true; | ||
5919 | + } | ||
5920 | + | ||
5921 | + | ||
5915 | var viewname = localStorage.getItem("currentViewTitle") | 5922 | var viewname = localStorage.getItem("currentViewTitle") |
5916 | var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId]; | 5923 | var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId]; |
5917 | 5924 | ||
@@ -6124,6 +6131,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6124,6 +6131,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6124 | } | 6131 | } |
6125 | 6132 | ||
6126 | $rootScope.isViewChange = true; | 6133 | $rootScope.isViewChange = true; |
6134 | + | ||
6135 | + if ($rootScope.isExtract == true) { | ||
6136 | + $rootScope.isExtract = false; | ||
6137 | + $rootScope.isHighLight = true; | ||
6138 | + } | ||
6139 | + | ||
6127 | $scope.layerNumber = 0; | 6140 | $scope.layerNumber = 0; |
6128 | // debugger; | 6141 | // debugger; |
6129 | var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value]; | 6142 | var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value]; |