mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
elofgren: BUGFIX: Make adding a newsletter type to the 'Newsletters' tree work when a draft is selected by changing the name of the 'NewsletterEditForm?' back to 'EditForm?' (reverts r36734 which was a fix to make the 'Save changes' button work on the now non-existant modal 'Usaved changes' dialog.) In addition this commit reverts r37173 because the form name is now 'EditForm?' like all other forms in NewsletterAdmin?.
(merged from branches/gsoc) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41853 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
318bae74f6
commit
dbb645cde6
@ -361,7 +361,7 @@ class NewsletterAdmin extends LeftAndMain {
|
||||
|
||||
$actions->push(new FormAction('save','Save'));
|
||||
|
||||
$form = new Form($this, "NewsletterEditForm", $fields, $actions);
|
||||
$form = new Form($this, "EditForm", $fields, $actions);
|
||||
$form->loadDataFrom($email);
|
||||
|
||||
if($email->Status != 'Draft') {
|
||||
|
@ -295,7 +295,7 @@ AddForm.prototype = {
|
||||
|
||||
// create a new node and add it to the site tree
|
||||
if( type == 'draft' ) {
|
||||
$('sitetree').addDraftNode('New draft newsletter', parentID, $('Form_NewsletterEditForm_ID').value );
|
||||
$('sitetree').addDraftNode('New draft newsletter', parentID, $('Form_EditForm_ID').value );
|
||||
} else {
|
||||
$('sitetree').addTypeNode('New newsletter type', $('Form_EditForm_ID').value );
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user