ADAM / AIAHTML5

Commit 91f3100cd61c3890d1c3136bfac24d274fd855ce

Authored by Amrita Vishnoi
1 parent 34fb900d

removed code of GUID 7d23cc17.

Inline Side-by-side
Showing 5 changed files with 8 additions and 8 deletions
150-DOCUMENTATION/~$AIA-Aug-Report.pptx 0 → 100644
View file @91f3100
No preview for this file type
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @91f3100
... ... @@ -39,7 +39,7 @@
39 39 <add key="EnableSSL" value="false" />
40 40 <add key="Site_Url" value ="//52.2.38.120"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42   - <add key="isUserAuthenticated" value="false"/>
  42 + <add key="isUserAuthenticated" value="true"/>
43 43 </appSettings>
44 44 <system.web>
45 45 <compilation debug="true" targetFramework="4.5" />
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
View file @91f3100
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @91f3100
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @91f3100
... ... @@ -1506,9 +1506,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1506 1506 //extarct clicked body part is extarct button is already enabled.
1507 1507  
1508 1508 if ($rootScope.isExtract == true) {
1509   - if ($rootScope.multiAnnotationIsON == false) {
1510   - $rootScope.isListManagerSelected = false;
1511   - }
  1509 + //if ($rootScope.multiAnnotationIsON == false) {
  1510 + // $rootScope.isListManagerSelected = false;
  1511 + //}
1512 1512 $scope.enableExtract(false);
1513 1513 }
1514 1514  
... ... @@ -1889,9 +1889,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1889 1889  
1890 1890 //extarct clisked body part is extarct button is already enabled.
1891 1891 if ($rootScope.isExtract == true) {
1892   - if ($rootScope.multiAnnotationIsON == false) {
1893   - $rootScope.isListManagerSelected = false;
1894   - }
  1892 + //if ($rootScope.multiAnnotationIsON == false) {
  1893 + // $rootScope.isListManagerSelected = false;
  1894 + //}
1895 1895 $scope.enableExtract(false);
1896 1896 }
1897 1897  
... ... @@ -2137,7 +2137,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2137 2137 var selectedAnnotation;
2138 2138  
2139 2139 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)
2140   - && $rootScope.isListManagerSelected && $rootScope.multiAnnotationIsON == true) {
  2140 + && $rootScope.isListManagerSelected) {
2141 2141  
2142 2142 multiTermList = $scope.AllTerms;
2143 2143 angular.forEach($rootScope.previousHighlightList, function (value, key) {
... ...