From 413fef4c6fa96abf0bdb11c047c113dc381dd481 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Thu, 23 Jun 2016 20:43:09 +0100
Subject: [PATCH] Don't lose disabled setting on email config submit (#441)

---
 application/views/configs/email_config.php   | 23 ++++++++++++++++----
 application/views/configs/invoice_config.php |  3 ++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/application/views/configs/email_config.php b/application/views/configs/email_config.php
index a592446f1..426938e05 100644
--- a/application/views/configs/email_config.php
+++ b/application/views/configs/email_config.php
@@ -115,10 +115,6 @@
 //validation and submit handling
 $(document).ready(function()
 {
-	$('#email_config_form').validate($.extend(form_support.handler, {
-		errorLabelContainer: "#email_error_message_box"
-	}));
-	
 	var check_protocol = function() {
 		if($("#protocol").val() == 'sendmail')
 		{
@@ -137,5 +133,24 @@ $(document).ready(function()
 	};
 
 	$("#protocol").change(check_protocol).ready(check_protocol);
+
+	$('#email_config_form').validate($.extend(form_support.handler, {
+		submitHandler: function(form) {
+			$(form).ajaxSubmit({
+				beforeSerialize: function(arr, $form, options) {
+					$("#mailpath, #smtp_host, #smtp_user, #smtp_pass, #smtp_port, #smtp_timeout, #smtp_crypto").prop("disabled", false); 
+					return true;
+				},
+				success: function(response) {
+					$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
+					// set back disabled state
+					check_protocol();
+				},
+				dataType:'json'
+			});
+		},
+		
+		errorLabelContainer: "#email_error_message_box"
+	}));
 });
 </script>
diff --git a/application/views/configs/invoice_config.php b/application/views/configs/invoice_config.php
index 12c880811..ec7ef0725 100644
--- a/application/views/configs/invoice_config.php
+++ b/application/views/configs/invoice_config.php
@@ -77,8 +77,9 @@ $(document).ready(function()
 		$("#sales_invoice_format, #recv_invoice_format, #invoice_default_comments, #invoice_email_message").prop('disabled', !invoice_enable);
 		return arguments.callee;
 	})();
+
 	$("#invoice_enable").change(enable_disable_invoice_enable);
-	
+
 	$('#invoice_config_form').validate($.extend(form_support.handler, {
 		submitHandler: function(form) {
 			$(form).ajaxSubmit({