From 7ecf56490a406914608c828b93e64f6e189ae99c Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 30 Apr 2013 16:54:18 +0200
Subject: [PATCH] FIX URL concat in tree actions (broke with 'translatable'
 module)

---
 javascript/CMSMain.AddForm.js          |  8 ++++++--
 javascript/CMSMain.Tree.js             | 27 +++++++++++++++++---------
 templates/Includes/CMSMain_TreeView.ss |  2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/javascript/CMSMain.AddForm.js b/javascript/CMSMain.AddForm.js
index 2c9004cf..03e66e52 100644
--- a/javascript/CMSMain.AddForm.js
+++ b/javascript/CMSMain.AddForm.js
@@ -98,8 +98,12 @@
 					if(state) parentId = parseInt(JSON.parse(state).ParentID, 10);
 				}
 					
-				var data = {selector: this.data('targetPanel'),pjax: this.data('pjax')},
-					url = parentId ? ss.i18n.sprintf(this.data('urlAddpage'), parentId) : this.attr('href');
+				var data = {selector: this.data('targetPanel'),pjax: this.data('pjax')}, url;
+				if(parentID) {
+					url = $.path.addSearchParams(ss.i18n.sprintf(this.data('urlAddpage'), parentId), this.data('extraParams'));
+				} else {
+					url = this.attr('href');
+				}
 
 				$('.cms-container').loadPanel(url, null, data);
 				e.preventDefault();
diff --git a/javascript/CMSMain.Tree.js b/javascript/CMSMain.Tree.js
index 6d98c8aa..67a273a5 100644
--- a/javascript/CMSMain.Tree.js
+++ b/javascript/CMSMain.Tree.js
@@ -60,9 +60,12 @@
 								'label': '<span class="jstree-pageicon"></span>' + klassData.title,
 								'_class': 'class-' + klass,
 								'action': function(obj) {
-									$('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
-									self.data('urlAddpage'), id, klass
-									));
+									$('.cms-container').entwine('.ss').loadPanel(
+										$.path.addSearchParams(
+											ss.i18n.sprintf(self.data('urlAddpage'), id, klass),
+											self.data('extraParams')
+										)
+									);
 								}
 							};
 						});
@@ -80,16 +83,22 @@
 								{
 									'label': ss.i18n._t('Tree.ThisPageOnly'),
 									'action': function(obj) {
-										$('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
-											self.data('urlDuplicate'), obj.data('id')
-										));
+										$('.cms-container').entwine('.ss').loadPanel(
+											$.path.addSearchParams(
+												ss.i18n.sprintf(self.data('urlDuplicate'), obj.data('id')), 
+												self.data('extraParams')
+											)
+										);
 									}
 								},{
 									'label': ss.i18n._t('Tree.ThisPageAndSubpages'),
 									'action': function(obj) {
-										$('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
-											self.data('urlDuplicatewithchildren'), obj.data('id')
-										));
+										$('.cms-container').entwine('.ss').loadPanel(
+											$.path.addSearchParams(
+												ss.i18n.sprintf(self.data('urlDuplicatewithchildren'), obj.data('id')), 
+												self.data('extraParams')
+											)
+										);
 									}
 								}
 							]									
diff --git a/templates/Includes/CMSMain_TreeView.ss b/templates/Includes/CMSMain_TreeView.ss
index 79e9c543..338d9463 100644
--- a/templates/Includes/CMSMain_TreeView.ss
+++ b/templates/Includes/CMSMain_TreeView.ss
@@ -19,7 +19,7 @@ $ExtraTreeTools
 	</div>
 	<% end_if %>
 
-	<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" data-url-updatetreenodes="$Link(updatetreenodes)" data-url-addpage="{$LinkPageAdd('AddForm/?action_doAdd=1')}&amp;ParentID=%s&amp;PageType=%s&amp;SecurityID=$SecurityID" data-url-editpage="$LinkPageEdit('%s')" data-url-duplicate="{$Link('duplicate/%s')}?SecurityID=$SecurityID" data-url-duplicatewithchildren="{$Link('duplicatewithchildren/%s')}?SecurityID=$SecurityID" data-url-listview="{$Link('?view=list')}" data-hints="$SiteTreeHints.XML">
+	<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" data-url-updatetreenodes="$Link(updatetreenodes)" data-url-addpage="{$LinkPageAdd('AddForm/?action_doAdd=1')}&amp;ParentID=%s&amp;PageType=%s" data-url-editpage="$LinkPageEdit('%s')" data-url-duplicate="{$Link('duplicate/%s')}" data-url-duplicatewithchildren="{$Link('duplicatewithchildren/%s')}" data-url-listview="{$Link('?view=list')}" data-hints="$SiteTreeHints.XML" data-extra-params="SecurityID=$SecurityID">
 		$SiteTreeAsUL
 	</div>
 </div>