[Testbot] Plone 5.0 - Python 2.7 - Build # 2557 - Still failing! - failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 2557 - Still Failing!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/2557/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2014-06-06T15:07:28-07:00
Author: Ross Patterson (rpatterson) <me at rpatterson.net>
Commit: https://github.com/plone/Products.CMFPlone/commit/698178e4b7bd8ea430bf1d34e8809fc485949236

Abstract the search form and livesearch action URLs

making it easier to extend the search portlet with custom views or other
actions.

Conflicts:
	docs/CHANGES.rst

Files changed:
M CHANGES.rst
M Products/CMFPlone/skins/plone_ecmascript/livesearch.js

diff --git a/CHANGES.rst b/CHANGES.rst
index b22a855..82f5452 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,7 +8,9 @@ Changelog
 5.0a3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Abstract the search form and livesearch action URLs making it easier to
+  extend the search portlet with custom views or other actions.
+  [rpatterson]
 
 
 5.0a2 (2014-04-20)
diff --git a/Products/CMFPlone/skins/plone_ecmascript/livesearch.js b/Products/CMFPlone/skins/plone_ecmascript/livesearch.js
index 779eb24..e8d5fd3 100644
--- a/Products/CMFPlone/skins/plone_ecmascript/livesearch.js
+++ b/Products/CMFPlone/skins/plone_ecmascript/livesearch.js
@@ -29,8 +29,10 @@ var livesearch = (function () {
         var $lastsearch = null,
             $request = null,
             $cache = {},
-            $querytarget = $form.attr('action').replace(/@@search$/g,"") + "livesearch_reply",
             $result = $form.find('div.LSResult'),
+            $querytarget = $form.attr('action').replace(
+                $form.data('action') || '@@search',
+                $result.data('livesearch') || 'livesearch_reply'),
             $shadow = $form.find('div.LSShadow'),
             $path = $form.find('input[name="path"]');
 




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 1729 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140606/f894b3cc/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 17863 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140606/f894b3cc/attachment-0003.obj>