From d02a311824ebb8b9057abb1f02651aab1517ca23 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 12 May 2009 02:17:21 +0000 Subject: [PATCH] BUGFIX Fix getsubtree command in CMS tree to work with Translatable (#3995) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76608 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- javascript/CMSMain_left.js | 5 ++++- javascript/LeftAndMain_left.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js index 876c7e15..be335170 100755 --- a/javascript/CMSMain_left.js +++ b/javascript/CMSMain_left.js @@ -144,7 +144,10 @@ ShowDeletedPagesAction.prototype = { var indicator = $('checkboxActionIndicator'); indicator.style.display = 'block'; - var request = new Ajax.Request(SiteTreeHandlers.loadTree_url + '?ID=0&ajax=1', { + var url = SiteTreeHandlers.loadTree_url + '?ID=0&ajax=1'; + if($('Form_EditForm_Locale')) url += "&locale=" + $('Form_EditForm_Locale').value; + + var request = new Ajax.Request(url, { onSuccess: function(response) { $('sitetree').innerHTML = response.responseText; SiteTree.applyTo($('sitetree')); diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js index bba33a72..e999f5ad 100755 --- a/javascript/LeftAndMain_left.js +++ b/javascript/LeftAndMain_left.js @@ -181,6 +181,7 @@ TreeNodeAPI.prototype = { var url = SiteTreeHandlers.loadTree_url; url += (url.match(/\?/)) ? '&' : '?'; url += 'ajax=1&ID=' + this.getIdx(); + if($('Form_EditForm_Locale')) url += "&locale=" + $('Form_EditForm_Locale').value; new Ajax.Request(url, { onSuccess : this.installSubtree.bind(this), onFailure : this.showSubtreeLoadingError