svn commit: r1794120 - in /manifoldcf/branches/release-2.7-branch: ./ CHANGES.txt framework/crawler-ui/src/main/webapp/javascript/mcf.js

[kwright]

Author: kwright
Date: Sat May  6 00:36:57 2017
New Revision: 1794120

URL: http://svn.apache.org/viewvc?rev=1794120&view=rev
Log:
Pull up fix for CONNECTORS-1423 from trunk.

Modified:
    manifoldcf/branches/release-2.7-branch/   (props changed)
    manifoldcf/branches/release-2.7-branch/CHANGES.txt
    
manifoldcf/branches/release-2.7-branch/framework/crawler-ui/src/main/webapp/javascript/mcf.js

Propchange: manifoldcf/branches/release-2.7-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May  6 00:36:57 2017
@@ -142,4 +142,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1791542,1791548,1791603,1791609
+/manifoldcf/trunk:1791542,1791548,1791603,1791609,1794105

Modified: manifoldcf/branches/release-2.7-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.7-branch/CHANGES.txt?rev=1794120&r1=1794119&r2=1794120&view=diff
==============================================================================
--- manifoldcf/branches/release-2.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.7-branch/CHANGES.txt Sat May  6 00:36:57 2017
@@ -3,6 +3,8 @@ $Id$
 
 ======================= Release 2.7.1 =====================
 
+CONNECTORS-1423: Fix the new UI to add certificates to connections with 
certificate stores.
+(Karl Wright, Kishore Kumar)
 
 ======================= Release 2.7 =====================
 

Modified: 
manifoldcf/branches/release-2.7-branch/framework/crawler-ui/src/main/webapp/javascript/mcf.js
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.7-branch/framework/crawler-ui/src/main/webapp/javascript/mcf.js?rev=1794120&r1=1794119&r2=1794120&view=diff
==============================================================================
--- 
manifoldcf/branches/release-2.7-branch/framework/crawler-ui/src/main/webapp/javascript/mcf.js
 (original)
+++ 
manifoldcf/branches/release-2.7-branch/framework/crawler-ui/src/main/webapp/javascript/mcf.js
 Sat May  6 00:36:57 2017
@@ -422,15 +422,21 @@ $.ManifoldCF.loadContent=function (url)
 $.ManifoldCF.submit=function (form)
 {
   $('.overlay,#loader').show();
-  var $form=$(form);
-  var action=$form.attr('action');
-  console.log("Ajax URL: " + action);
-  console.log($form.serialize());
+
+  var formData = new FormData(form),
+      $form = $(form),
+      action = $form.attr('action'),
+      method = $form.attr('method');
+
   _preLoadContent();
+
   $.ajax({
-    type: $form.attr('method'),
+    type: method,
     url: action,
-    data: $form.serialize()
+    data: formData,
+    cache: false,
+    contentType: false,
+    processData: false
   }).done(function (data,textStatus,jqXHR)
   {
     var page=jqXHR.getResponseHeader("page");