Commit c9c1989189f8e66f43393c88b3f8ba294589173b

Authored by Amrita Vishnoi
2 parents effa8c6f 79c2892d

Merge branch 'UpadteCAM_Name' into Develop

400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -1619,7 +1619,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -1619,7 +1619,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1619 }) 1619 })
1620 }, 1620 },
1621 function (error) { 1621 function (error) {
1622 - // handle errors here 1622 +
1623 console.log(' error: ' + error.statusText); 1623 console.log(' error: ' + error.statusText);
1624 } 1624 }
1625 ) 1625 )
@@ -1637,7 +1637,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -1637,7 +1637,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1637 var currentView = $rootScope.getLocalStorageValue("currentViewTitle"); 1637 var currentView = $rootScope.getLocalStorageValue("currentViewTitle");
1638 var viewNmeHtml = '<option>' + currentView + '</option>' 1638 var viewNmeHtml = '<option>' + currentView + '</option>'
1639 $('#viewName').append(viewNmeHtml); 1639 $('#viewName').append(viewNmeHtml);
1640 - //$("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>"); 1640 +
1641 $rootScope.isLoading = false; 1641 $rootScope.isLoading = false;
1642 $('#spinner').css('visibility', 'hidden'); 1642 $('#spinner').css('visibility', 'hidden');
1643 1643
500-DBDump/additionalScript/UpdateModuleName.sql
1 -UPdate ResourceModule set Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE'  
2 -where Title='CAM';  
3 \ No newline at end of file 1 \ No newline at end of file
  2 +UPdate ResourceModule set Title='Complementary and Alternative Medicine'
  3 +where Title='COMPLEMENTARY AND ALTERNATIVE MEDICINE';
4 \ No newline at end of file 4 \ No newline at end of file