ADAM / AIAHTML5

Commit a443fa739a5873fceccc24674a503cab87522977

Authored by Amrita Vishnoi
2 parents ee13f739 c16d167c

Merge branch '#US-15245_' into Develop

Inline Side-by-side
Showing 5 changed files with 12 additions and 11 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @a443fa7
... ... @@ -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 @a443fa7
... ... @@ -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 @a443fa7
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @a443fa7
... ... @@ -3316,13 +3316,12 @@ 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   - $rootScope.errorMassage = AdminConstants.MAIL_SENT;
  3319 + $rootScope.errorMassage = AdminConstants.MAIL_SENT_SUCCESS_MESSAGE;
3324 3320 $("#messageModal").modal('show');
3325 3321 }
  3322 + $("#adminModal").fadeOut();
  3323 + $("#adminModal").modal('hide');
  3324 + $('[name="adminAccessTextArea"]').val('');
3326 3325 },
3327 3326 function (error) {
3328 3327 console.log(' Error in sending mail to admin support = ' + error.statusText);
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @a443fa7
... ... @@ -312,7 +312,9 @@ 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.",
  317 + "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon."
316 318 })
317 319 AIA.constant("UserTypeConstants", {
318 320 "SUPER_ADMIN": "Super Admin",
... ...