ADAM / AIAHTML5

Commit bfb5097bc10691a6c5fe282cfcf439b47f9e78c5

Authored by Utkarsh Singh
2 parents ee13f739 a142b0fb

Merge branch 'US_15245_' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Inline Side-by-side
Showing 5 changed files with 18 additions and 10 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @bfb5097
... ... @@ -40,8 +40,8 @@
40 40 <add key="Site_Url" value ="//52.2.38.120"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42 42 <add key="isUserAuthenticated" value="false"/>
43   - <add key="AdminSupport" value=""/>
44   - </appSettings>
  43 + <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
  44 + </appSettings>
45 45 <system.web>
46 46 <compilation debug="true" targetFramework="4.5" />
47 47 <httpRuntime targetFramework="4.5" />
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
  View file @bfb5097
... ... @@ -39,9 +39,9 @@
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="True"/>
43   - <add key="AdminSupport" value=""/>
44   - </appSettings>
  42 + <add key="isUserAuthenticated" value="false"/>
  43 + <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
  44 + </appSettings>
45 45 <system.web>
46 46 <compilation debug="true" targetFramework="4.5" />
47 47 <httpRuntime targetFramework="4.5" />
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @bfb5097
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @bfb5097
... ... @@ -3316,13 +3316,20 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3316 3316 AdminService.SendAdminAccessRequestMail(userInfo)
3317 3317 .then(function (result) {
3318 3318 if (result == AdminConstants.MAIL_SENT) {
3319   - $("#adminModal").fadeOut();
3320   - $("#adminModal").modal('hide');
3321   - $("adminAccessTextArea").text('');
3322   -
3323 3319 $rootScope.errorMassage = AdminConstants.MAIL_SENT;
3324 3320 $("#messageModal").modal('show');
3325 3321 }
  3322 + else if (result == AdminConstants.MAIL_NOT_SENT) {
  3323 + $rootScope.errorMassage = AdminConstants.MAIL_NOT_SENT;
  3324 + $("#messageModal").modal('show');
  3325 + }
  3326 + else {
  3327 + $rootScope.errorMassage = result;
  3328 + $("#messageModal").modal('show');
  3329 + }
  3330 + $("#adminModal").fadeOut();
  3331 + $("#adminModal").modal('hide');
  3332 + $('[name="adminAccessTextArea"]').val('');
3326 3333 },
3327 3334 function (error) {
3328 3335 console.log(' Error in sending mail to admin support = ' + error.statusText);
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @bfb5097
... ... @@ -312,7 +312,8 @@ AIA.constant(&quot;LoginMessageConstants&quot;, {
312 312 })
313 313 AIA.constant("AdminConstants", {
314 314 "ERROR_IN_SENDING_MAIL": "Some internal error occured.",
315   - "MAIL_SENT": "Mail sent."
  315 + "MAIL_SENT": "Mail sent.",
  316 + "MAIL_NOT_SENT": "Mail not sent."
316 317 })
317 318 AIA.constant("UserTypeConstants", {
318 319 "SUPER_ADMIN": "Super Admin",
... ...