From 76afea41bc2a663ae41ad3f1c575da595f7dca2c Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Mon, 10 Nov 2008 22:23:48 +0000 Subject: [PATCH] APICHANGE: tidy up NewsletterAdmin. BUGFIX: a lot of methods in this class now passed $params as HTTPRequest object, rather than as a array if the function is called from Ajax or top-level of front-end, some method is called in both manner, ie. called from Ajax and called internally as well, so we need to check $params type and do further process. This is a partial fix of open source ticket #3035 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65554 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- javascript/LeftAndMain_right.js | 3 ++- templates/Includes/CMSMain_right.ss | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js index 67ddda2c..a2375f12 100755 --- a/javascript/LeftAndMain_right.js +++ b/javascript/LeftAndMain_right.js @@ -154,7 +154,7 @@ CMSForm.prototype = { * * @param publish boolean (optional) whether to publish in addition to saving */ - save: function(ifChanged, callAfter, action, publish) { + save: function(ifChanged, callAfter, action, publish) {console.log(this.action); _AJAX_LOADING = true; // Note: TinyMCE coupling if(typeof tinyMCE != 'undefined') tinyMCE.triggerSave(); @@ -195,6 +195,7 @@ CMSForm.prototype = { } statusMessage(ss.i18n._t('CMSMAIN.SAVING'), null, true); + console.log(this.action+"?"+data); new Ajax.Request(this.action, { method : this.method, postBody: data, diff --git a/templates/Includes/CMSMain_right.ss b/templates/Includes/CMSMain_right.ss index 923481d7..a4151c7b 100755 --- a/templates/Includes/CMSMain_right.ss +++ b/templates/Includes/CMSMain_right.ss @@ -23,7 +23,6 @@

- <% if EditForm %> $EditForm <% else %>