From 643d6e35f64fd1131d1e8fb736193b6e9dea76f7 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 14 Apr 2009 23:21:52 +0000
Subject: [PATCH] MINOR: hide email notifications from other page lists

---
 code/UserDefinedForm.php | 48 +++++++---------------------------------
 1 file changed, 8 insertions(+), 40 deletions(-)

diff --git a/code/UserDefinedForm.php b/code/UserDefinedForm.php
index 4300b42..fa1baed 100755
--- a/code/UserDefinedForm.php
+++ b/code/UserDefinedForm.php
@@ -77,32 +77,7 @@ class UserDefinedForm extends Page {
 		
 		// view the submissions
 		$fields->addFieldToTab("Root.Content."._t('UserDefinedForm.SUBMISSIONS','Submissions'), new SubmittedFormReportField( "Reports", _t('UserDefinedForm.RECEIVED', 'Received Submissions'), "", $this ) );
-		/*
-		 Trying to get submissions working as a tablelistfield. close, but not close enough
-		$query = new SQLQuery();
-		$query->from("SubmittedForm");
-		$query->where("SubmittedForm.ParentID = '$this->ID'");
-		$query->orderby("SubmittedForm.Created");
-		$query->limit("20");
-		$query->leftJoin("SubmittedFormField", "SubmittedFormField.ParentID = SubmittedForm.ID");
-		
-		
-		$myTableListField = new TableListField(
-			'Submissions',
-			'SubmittedForm'
-		);
-		$myTableListField->setCustomQuery($query);
-		$fieldValues = array(
-			"Title" => "Title",
-			"Value" => "$Value",
-			"Name" => "$Name",
-			"ID" => "$ID",
-			"ParentID" => "$ParentID"
-		);
-		$myTableListField->setFieldList($fieldValues);
-		
-		$fields->addFieldToTab("Root.Test", $myTableListField);
-		*/
+
 		// who do we email on submission
 		$emailRecipients = new HasManyComplexTableField($this,
 	    	'EmailRecipients',
@@ -112,7 +87,8 @@ class UserDefinedForm extends Page {
 				'EmailSubject' => 'Subject',
 				'EmailFrom' => 'From'
 	    	),
-	    	'getCMSFields_forPopup'
+	    	'getCMSFields_forPopup',
+			"FormID = '$this->ID'"
 	    );
 		$emailRecipients->setAddTitle(_t('UserDefinedForm.AEMAILRECIPIENT', 'A Email Recipient'));
 		$fields->addFieldToTab("Root.Content."._t('UserDefinedForm.EMAILRECIPIENTS', 'Email Recipients'), $emailRecipients);
@@ -406,17 +382,6 @@ class UserDefinedForm_Controller extends Page_Controller {
 		$form->loadDataFrom($this->failover);
 
 		return $form;
-	}	
-	/**
-	 * Clear a form action. This is the fall back to if it doesn't work
-	 * with the javascript
-	 * 
-	 * @param Array data
-	 * @param Form The form to clear
-	 */
-	public function clearForm($data, $form) {
-		Session::clear('FormInfo.Form');
-		return Director::redirectBack();
 	}
 	
 	/**
@@ -591,7 +556,7 @@ class UserDefinedForm_EmailRecipient extends DataObject {
 		'EmailAddress' => 'Varchar(200)',
 		'EmailSubject' => 'Varchar(200)',
 		'EmailFrom' => 'Varchar(200)',
-		'EmailBody' => 'HTMLText'
+		'EmailBody' => 'Text'
 	);
 	
 	static $has_one = array(
@@ -605,10 +570,13 @@ class UserDefinedForm_EmailRecipient extends DataObject {
 	 * @return FieldSet
 	 */
 	public function getCMSFields_forPopup() {
+		$forms = DataObject::get("UserDefinedForm");
+		if($forms) $forms = $forms->toDropdownMap('ID', 'Title');
 		$fields = new FieldSet(
 			new TextField('EmailSubject', _t('UserDefinedForm.EMAILSUBJECT', 'Email Subject')),
 			new TextField('EmailFrom', _t('UserDefinedForm.FROMADDRESS','From Address')),
-			new TextField('EmailAddress', _t('UserDefinedForm.SENDEMAILTO','Send Email To'))
+			new TextField('EmailAddress', _t('UserDefinedForm.SENDEMAILTO','Send Email To')),
+			new DropdownField('FormID', 'Form', $forms)
 		);
 		
 		if($this->Form()) {