Commit b4ca0c4aac937619403f08ba5a6e9489e457ea6a
Merge branch 'Develop' into QA
Showing
5 changed files
with
14 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
| @@ -41,8 +41,8 @@ | @@ -41,8 +41,8 @@ | ||
| 41 | <add key ="HostAddress" value="10.100.12.13" /> | 41 | <add key ="HostAddress" value="10.100.12.13" /> |
| 42 | <add key="isUserAuthenticated" value="false"/> | 42 | <add key="isUserAuthenticated" value="false"/> |
| 43 | <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/> | 43 | <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/> |
| 44 | - <!--<add key ="AIADatabaseV5Context" value="Data Source=192.168.90.53;Initial Catalog=AIADatabaseV5;User ID=AIA_Dev;Password=india123;"/>--> | ||
| 45 | - <add key ="AIADatabaseV5Context" value="Data Source=52.6.248.70;Initial Catalog=AIADatabase;User ID=amrita;Password=Ebix@2017;"/> | 44 | + <add key ="AIADatabaseV5Context" value="Data Source=192.168.90.53;Initial Catalog=AIADatabaseV5;User ID=AIA_Dev;Password=india123;"/> |
| 45 | + <!--<add key ="AIADatabaseV5Context" value="Data Source=52.6.248.70;Initial Catalog=AIADatabase;User ID=amrita;Password=Ebix@2017;"/>--> | ||
| 46 | 46 | ||
| 47 | </appSettings> | 47 | </appSettings> |
| 48 | <system.web> | 48 | <system.web> |
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
| @@ -42,6 +42,8 @@ | @@ -42,6 +42,8 @@ | ||
| 42 | <add key="isUserAuthenticated" value="false"/> | 42 | <add key="isUserAuthenticated" value="false"/> |
| 43 | <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/> | 43 | <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/> |
| 44 | <add key ="AIADatabaseV5Context" value="Data Source=192.168.90.53;Initial Catalog=AIADatabaseV5;User ID=AIA_Dev;Password=india123;"/> | 44 | <add key ="AIADatabaseV5Context" value="Data Source=192.168.90.53;Initial Catalog=AIADatabaseV5;User ID=AIA_Dev;Password=india123;"/> |
| 45 | + <!--<add key ="AIADatabaseV5Context" value="Data Source=52.6.248.70;Initial Catalog=AIADatabase;User ID=amrita;Password=Ebix@2017;"/>--> | ||
| 46 | + | ||
| 45 | </appSettings> | 47 | </appSettings> |
| 46 | <system.web> | 48 | <system.web> |
| 47 | <compilation debug="true" targetFramework="4.5" /> | 49 | <compilation debug="true" targetFramework="4.5" /> |
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -40,6 +40,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -40,6 +40,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 40 | modesty: null | 40 | modesty: null |
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | + // on refersh this variable will also get null that is why we are only checking this variable on initialize that if it is null that means page gets refershed. | ||
| 44 | + $rootScope.refreshcheck = null; | ||
| 45 | + | ||
| 46 | + | ||
| 47 | + | ||
| 43 | $rootScope.isModestyOn; | 48 | $rootScope.isModestyOn; |
| 44 | $rootScope.isModestyOff; | 49 | $rootScope.isModestyOff; |
| 45 | $rootScope.SetSettingActiveTab; | 50 | $rootScope.SetSettingActiveTab; |
| @@ -251,7 +256,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -251,7 +256,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 251 | if (userInfo.loginId != undefined || userInfo.loginId != "" || userInfo.loginId != null) { | 256 | if (userInfo.loginId != undefined || userInfo.loginId != "" || userInfo.loginId != null) { |
| 252 | $rootScope.isVisibleLogin = false; | 257 | $rootScope.isVisibleLogin = false; |
| 253 | $rootScope.userData = userInfo; | 258 | $rootScope.userData = userInfo; |
| 254 | - $rootScope.userModules = userInfo.modules; | 259 | + $rootScope.userModules = userInfo.Modules; |
| 260 | + if ($rootScope.refreshcheck == null) { | ||
| 261 | + $location.path('/'); | ||
| 262 | + } | ||
| 255 | } | 263 | } |
| 256 | } | 264 | } |
| 257 | catch (e) { | 265 | catch (e) { |
| @@ -614,6 +622,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -614,6 +622,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 614 | //jspanel functionality.. | 622 | //jspanel functionality.. |
| 615 | 623 | ||
| 616 | $rootScope.getModuleScrollPosition = function () { | 624 | $rootScope.getModuleScrollPosition = function () { |
| 625 | + $rootScope.refreshcheck = "check"; | ||
| 617 | $('.mCSB_container ul li').click(function () { | 626 | $('.mCSB_container ul li').click(function () { |
| 618 | 627 | ||
| 619 | $rootScope.scrollTopPosition = $(this).position().top; | 628 | $rootScope.scrollTopPosition = $(this).position().top; |