From f7d85beb60afdc35edf9aa445023458a0068d3cf Mon Sep 17 00:00:00 2001 From: Roman Kozlovskyi Date: Thu, 20 Sep 2012 18:05:29 +0300 Subject: [PATCH 1/3] Fixed context for getting ajax results --- plone/formwidget/querystring/querywidget.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/plone/formwidget/querystring/querywidget.js b/plone/formwidget/querystring/querywidget.js index ef839cb..f5c621a 100644 --- a/plone/formwidget/querystring/querywidget.js +++ b/plone/formwidget/querystring/querywidget.js @@ -171,7 +171,17 @@ }; $.querywidget.updateSearch = function () { - var query = portal_url + "/@@querybuilder_html_results?"; + var context_url = (function() { + var baseUrl, pieces; + baseUrl = $('base').attr('href'); + if (!baseUrl) { + pieces = window.location.href.split('/'); + pieces.pop(); + baseUrl = pieces.join('/'); + } + return baseUrl; + })(); + var query = context_url + "/@@querybuilder_html_results?"; var querylist = []; var items = $('.QueryWidget .queryindex'); if (!items.length) { @@ -201,7 +211,7 @@ break; } - $.get(portal_url + '/@@querybuildernumberofresults?' + querylist.join('&'), + $.get(context_url + '/@@querybuildernumberofresults?' + querylist.join('&'), {}, function (data) { results.html(data); }); }); From 4d9e8a6053ccbc7dda6459367b78fca8725cfbdc Mon Sep 17 00:00:00 2001 From: Roman Kozlovskyi Date: Thu, 20 Sep 2012 18:12:11 +0300 Subject: [PATCH 2/3] Update CHANGES.txt, up version --- CHANGES.txt | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 69db765..48140e7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,13 @@ Changelog ========= +1.0b3 (unreleased) +------------------ + +- Fixed context for getting ajax results + [kroman0] + + 1.0b2 (2012-03-19) ------------------ diff --git a/setup.py b/setup.py index 319d457..497d8d7 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = '1.0b2' +version = '1.0b3' setup(name='plone.formwidget.querystring', version=version, From 91ac6ce6e2a21715abc33d3d7b2645b1feec66db Mon Sep 17 00:00:00 2001 From: Roman Kozlovskiy Date: Sun, 23 Sep 2012 21:48:56 +0300 Subject: [PATCH 3/3] Fixed conditional initialization of querywidget --- CHANGES.txt | 3 +++ plone/formwidget/querystring/querywidget.js | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 48140e7..7050129 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,9 @@ Changelog - Fixed context for getting ajax results [kroman0] +- Fixed conditional initialization of querywidget, + see https://dev.plone.org/ticket/12529 [kroman0] + 1.0b2 (2012-03-19) ------------------ diff --git a/plone/formwidget/querystring/querywidget.js b/plone/formwidget/querystring/querywidget.js index f5c621a..fbddfa5 100644 --- a/plone/formwidget/querystring/querywidget.js +++ b/plone/formwidget/querystring/querywidget.js @@ -226,6 +226,11 @@ // Enhance for javascript browsers $(document).ready(function () { + // Check if QueryWidget exists on page + if ($(".QueryWidget").length === 0) { + return false; + } + // Init $.querywidget.init();