From a142b0fb59bedfcdda5cc4e6e282da503040eb76 Mon Sep 17 00:00:00 2001 From: Utkarsh Singh Date: Mon, 20 Mar 2017 13:45:13 +0530 Subject: [PATCH] Committed code. Refs: US_15245 --- 400-SOURCECODE/AIAHTML5.API/Web.config | 4 ++-- 400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config | 6 +++--- 400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb | Bin 46592 -> 0 bytes 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 15 +++++++++++---- 400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js | 3 ++- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.API/Web.config b/400-SOURCECODE/AIAHTML5.API/Web.config index 21e9e01..a3f2c58 100644 --- a/400-SOURCECODE/AIAHTML5.API/Web.config +++ b/400-SOURCECODE/AIAHTML5.API/Web.config @@ -40,8 +40,8 @@ - - + + diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config index 92603bf..a3f2c58 100644 --- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config +++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config @@ -39,9 +39,9 @@ - - - + + + diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb index 77b7823..6afcfb5 100644 Binary files a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb and b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb differ diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 9b034e3..4f515fe 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -3316,13 +3316,20 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic AdminService.SendAdminAccessRequestMail(userInfo) .then(function (result) { if (result == AdminConstants.MAIL_SENT) { - $("#adminModal").fadeOut(); - $("#adminModal").modal('hide'); - $("adminAccessTextArea").text(''); - $rootScope.errorMassage = AdminConstants.MAIL_SENT; $("#messageModal").modal('show'); } + else if (result == AdminConstants.MAIL_NOT_SENT) { + $rootScope.errorMassage = AdminConstants.MAIL_NOT_SENT; + $("#messageModal").modal('show'); + } + else { + $rootScope.errorMassage = result; + $("#messageModal").modal('show'); + } + $("#adminModal").fadeOut(); + $("#adminModal").modal('hide'); + $('[name="adminAccessTextArea"]').val(''); }, function (error) { console.log(' Error in sending mail to admin support = ' + error.statusText); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index f4a4f10..361bf09 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -312,7 +312,8 @@ AIA.constant("LoginMessageConstants", { }) AIA.constant("AdminConstants", { "ERROR_IN_SENDING_MAIL": "Some internal error occured.", - "MAIL_SENT": "Mail sent." + "MAIL_SENT": "Mail sent.", + "MAIL_NOT_SENT": "Mail not sent." }) AIA.constant("UserTypeConstants", { "SUPER_ADMIN": "Super Admin", -- libgit2 0.21.4