Merge pull request #1 from plone/relative-path
Fixed context for getting ajax results
This commit is contained in:
commit
36494362bf
10
CHANGES.txt
10
CHANGES.txt
|
@ -1,6 +1,16 @@
|
|||
Changelog
|
||||
=========
|
||||
|
||||
1.0b3 (unreleased)
|
||||
------------------
|
||||
|
||||
- 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)
|
||||
------------------
|
||||
|
||||
|
|
|
@ -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); });
|
||||
});
|
||||
|
@ -216,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();
|
||||
|
||||
|
|
Reference in New Issue