diff --git a/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs b/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs index 63f2c5c..6342e8e 100644 --- a/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs +++ b/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs @@ -10,7 +10,7 @@ namespace AIAHTML5.API.Constants public const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details."; public const string USER_NOT_FOUND = "User not found."; public const string MAIL_NOT_SENT = "Mail not sent."; - public const string MAIL_SENT = "Mail has been sent."; + public const string MAIL_SENT = "Mail sent."; } diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config index b7fca52..92603bf 100644 --- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config +++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config @@ -30,7 +30,7 @@ - - - - - - - - - - - - diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb index a978734..77b7823 100644 --- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb +++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index dc5d273..4e011b7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -3313,30 +3313,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic userInfo.emailId = $rootScope.userData.emailId; } - if (userInfo.userMessage != undefined && userInfo.userMessage != '' && userInfo.userMessage != null) { - - AdminService.SendAdminAccessRequestMail(userInfo) + AdminService.SendAdminAccessRequestMail(userInfo) .then(function (result) { - if (result == AdminConstants.MAIL_SENT) { - $("#adminModal").fadeOut(); - $("#adminModal").modal('hide'); - $("adminAccessTextArea").text(''); + if (result == AdminConstants.MAIL_SENT) { + $("#adminModal").fadeOut(); + $("#adminModal").modal('hide'); + $("adminAccessTextArea").text(''); - $rootScope.errorMassage = AdminConstants.ADMIN_ACCESS_REQUEST_SUCCESS; - $("#messageModal").modal('show'); - } + $rootScope.errorMassage = AdminConstants.MAIL_SENT; + $("#messageModal").modal('show'); + } }, function (error) { console.log(' Error in sending mail to admin support = ' + error.statusText); $rootScope.errorMassage = AdminConstants.ERROR_IN_SENDING_MAIL; $("#messageModal").modal('show'); }); - } - else { - $rootScope.errorMassage = AdminConstants.EMPTY_MESSAGE; - $("#spnError").text(AdminConstants.EMPTY_MESSAGE); - - } }; $rootScope.CloseAAModal = function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index 1f04cc1..f4a4f10 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -311,10 +311,8 @@ AIA.constant("LoginMessageConstants", { }) AIA.constant("AdminConstants", { - "ADMIN_ACCESS_REQUEST_SUCCESS": "Mail has been sent to referenced authority.", - "EMPTY_MESSAGE": "Please, type some message before submitting.", "ERROR_IN_SENDING_MAIL": "Some internal error occured.", - "MAIL_SENT": "Mail has been sent." + "MAIL_SENT": "Mail sent." }) AIA.constant("UserTypeConstants", { "SUPER_ADMIN": "Super Admin",