From ed0232eb713d747f8f152d0746ac2812c4c76e6f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 16 Sep 2007 01:29:40 +0000
Subject: [PATCH] elofgren: BUGFIX: Make adding newsletter types work again
 (was broken by r38923). Fix long-standing problem of whole page reloading
 when adding a Newsletter type. Now it is always added via AJAX. (merged from
 branches/gsoc)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42006 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/NewsletterAdmin_left.js            | 20 +++++++++++--------
 .../Includes/NewsletterAdmin_SiteTree.ss      |  3 +++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/javascript/NewsletterAdmin_left.js b/javascript/NewsletterAdmin_left.js
index 320a7b71..0a3f6b48 100755
--- a/javascript/NewsletterAdmin_left.js
+++ b/javascript/NewsletterAdmin_left.js
@@ -256,12 +256,15 @@ AddForm.prototype = {
     
   form_submit : function() {
 		var st = $('sitetree');
-		
-		if( st.selected.length )
-			selectedNode = st.selected[0];
-		else
-			selectedNode = st.selected;
-        
+		if (st) {
+			if( st.selected && st.selected.length ) {
+				selectedNode = st.selected[0];
+			} else {
+				selectedNode = st.selected;
+			}
+        	} else {
+			var selectedNode = null;
+		}
     var parentID = null;
     
     while( selectedNode && !parentID ) {
@@ -275,8 +278,9 @@ AddForm.prototype = {
 			alert("You have to save a page before adding children underneath it");
 			
 		} else {
-			
-			this.elements.ParentID.value = parentID;
+			if (this.elements) {
+				this.elements.ParentID.value = parentID;
+			}
 
       var type = 'draft';
       var selectIDPrefix = 'draft_' + parentID + '_';
diff --git a/templates/Includes/NewsletterAdmin_SiteTree.ss b/templates/Includes/NewsletterAdmin_SiteTree.ss
index 45f7e0cd..68adef58 100755
--- a/templates/Includes/NewsletterAdmin_SiteTree.ss
+++ b/templates/Includes/NewsletterAdmin_SiteTree.ss
@@ -27,4 +27,7 @@
 		</li>
 	<% end_control %>
 	</ul>
+<% else %>
+<ul id="sitetree" class="tree unformatted">
+</ul>
 <% end_if %>