BUGFIX Selecting correct parent when adding a new page (fixes #7188)

mateusz · Jun 3, 2012 · 8847506 · 8847506
1 parent 9c697f4
commit 8847506
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/javascript/CMSMain.AddForm.js b/javascript/CMSMain.AddForm.js
@@ -111,8 +111,16 @@
 
 		$(".cms-page-add-button").entwine({
 			onclick: function(e) {
-				$('.cms-page-add-form-dialog').dialog('open');
+				var selected = $('.cms-tree').jstree('get_selected'),
+					parentId = selected ? $(selected[0]).data('id') : null,
+					data = {selector: this.data('targetPanel'),pjax: this.data('pjax')},
+					url = parentId ? ss.i18n.sprintf(this.data('urlAddpage'), parentId) : this.attr('href');
+
+				$('.cms-container').loadPanel(url, null, data);
 				e.preventDefault();
+
+				// $('.cms-page-add-form-dialog').dialog('open');
+				// e.preventDefault();
 			}
 		});
 	});

diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/Includes/CMSPagesController_ContentToolActions.ss
@@ -1,5 +1,5 @@
 <div class="cms-actions-row">
-	<a class="cms-page-add-button ss-ui-button ss-ui-action-constructive cms-panel-link" data-icon="add" href="$LinkPageAdd"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
+	<a class="cms-page-add-button ss-ui-button ss-ui-action-constructive" data-icon="add" href="$LinkPageAdd" data-url-addpage="{$LinkPageAdd}?ParentID=%s"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
 </div>
 
 <div class="cms-content-batchactions">