From 39421cbb738e1af1e4510bf8df7fbff0b3c57ea3 Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Mon, 1 Mar 2010 21:56:55 +0000 Subject: [PATCH] BUGFIX: Improve stability of page dropdown on SubsitesVirtualPages (from r86097) (from r96275) --- javascript/SubsitesTreeDropdownField.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/javascript/SubsitesTreeDropdownField.js b/javascript/SubsitesTreeDropdownField.js index 6657fa3..b1f43ce 100644 --- a/javascript/SubsitesTreeDropdownField.js +++ b/javascript/SubsitesTreeDropdownField.js @@ -14,12 +14,11 @@ SubsitesTreeDropdownField.prototype = { }, ajaxGetTree: function(after) { - // This if block is necessary to maintain both 2.2 and 2.3 support var baseURL = this.helperURLBase(); - if(baseURL.match('action_callfieldmethod')) var ajaxURL = baseURL+ '&methodName=gettree&forceValues=' + this.inputTag.value; - else var ajaxURL = baseURL+ 'gettree?forceValues=' + this.inputTag.value; + // Can't force value because it might be on a different subsite! + var ajaxURL = baseURL+ 'gettree?forceValues=' + 0; //this.inputTag.value; - // Customized: Append subsiteid (evaluated in SubsitesVirtualPage.php) + // Customised: Append subsiteid (evaluated in SubsitesVirtualPage.php) ajaxURL += '&' + this.inputTag.name + '_SubsiteID=' + parseInt(this.subsiteID()); ajaxURL += $('SecurityID') ? '&SecurityID=' + $('SecurityID').value : ''; @@ -37,11 +36,8 @@ SubsitesTreeDropdownField.prototype = { var ul = this.treeNodeHolder(); ul.innerHTML = ss.i18n._t('LOADING'); - // This if block is necessary to maintain both 2.2 and 2.3 support var baseURL = this.options.dropdownField.helperURLBase(); - - if(baseURL.match('action_callfieldmethod')) var ajaxURL = baseURL+ '&methodName=getsubtree&SubtreeRootID=' + this.getIdx(); - else var ajaxURL = baseURL+ 'getsubtree?SubtreeRootID=' + this.getIdx(); + var ajaxURL = baseURL+ 'getsubtree?SubtreeRootID=' + this.getIdx(); // Find the root of the tree - this points to a list item in the tree, not the root div we actually want // @todo: We should be using framework API calls to find the tree @@ -58,4 +54,4 @@ SubsitesTreeDropdownField.prototype = { }); } } -SubsitesTreeDropdownField.applyTo('div.SubsitesTreeDropdownField'); \ No newline at end of file +SubsitesTreeDropdownField.applyTo('div.SubsitesTreeDropdownField');