ADAM / AIAHTML5

Commit ff7cbbe0135c44c3e931a7d49b8ecfe052697281

Authored by Amrita Vishnoi
2 parents aff6adbd 2e6bc8fd

Merge branch '17254Bug' into Develop

Inline Side-by-side
Showing 2 changed files with 6 additions and 1 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @ff7cbbe
... ... @@ -37,7 +37,7 @@
37 37 <add key="SMTPAddress" value="10.100.12.13" />
38 38 <add key="SMTPPort" value="25" />
39 39 <add key="EnableSSL" value="false" />
40   - <add key="Site_Url" value ="http://34.207.39.107/"/>
  40 + <add key="Site_Url" value ="http://qa.beta.interactiveanatomy.com/"/>
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"/>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @ff7cbbe
... ... @@ -130,6 +130,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
130 130 else {
131 131 if (result.loginId != undefined || result.loginId != "" || result.loginId != null) {
132 132  
  133 + if ($("#messageModal").length > 0){
  134 +
  135 + $("#messageModal").modal('hide');
  136 + }
133 137 $rootScope.userData = result;
134 138 $rootScope.userModules = result.modules;
135 139 $rootScope.isVisibleLogin = false;
... ... @@ -144,6 +148,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
144 148 else
145 149 $rootScope.haveRoleAdmin = true;
146 150 }
  151 +
147 152 }
148 153 }
149 154 },
... ...