ADAM / AIAHTML5

Commit b4ca0c4aac937619403f08ba5a6e9489e457ea6a

Authored by Amrita Vishnoi
2 parents d15405df 5e9f0603

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 5 changed files with 14 additions and 3 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @b4ca0c4
... ... @@ -41,8 +41,8 @@
41 41 <add key ="HostAddress" value="10.100.12.13" />
42 42 <add key="isUserAuthenticated" value="false"/>
43 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 47 </appSettings>
48 48 <system.web>
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
View file @b4ca0c4
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
  View file @b4ca0c4
... ... @@ -42,6 +42,8 @@
42 42 <add key="isUserAuthenticated" value="false"/>
43 43 <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
44 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 47 </appSettings>
46 48 <system.web>
47 49 <compilation debug="true" targetFramework="4.5" />
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @b4ca0c4
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @b4ca0c4
... ... @@ -40,6 +40,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
40 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 48 $rootScope.isModestyOn;
44 49 $rootScope.isModestyOff;
45 50 $rootScope.SetSettingActiveTab;
... ... @@ -251,7 +256,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
251 256 if (userInfo.loginId != undefined || userInfo.loginId != "" || userInfo.loginId != null) {
252 257 $rootScope.isVisibleLogin = false;
253 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 265 catch (e) {
... ... @@ -614,6 +622,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
614 622 //jspanel functionality..
615 623  
616 624 $rootScope.getModuleScrollPosition = function () {
  625 + $rootScope.refreshcheck = "check";
617 626 $('.mCSB_container ul li').click(function () {
618 627  
619 628 $rootScope.scrollTopPosition = $(this).position().top;
... ...