tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-29 16:09:40 +02:00
Code Issues Projects Releases Wiki Activity

Reverted r111624

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111625 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-04 05:52:58 +00:00
parent ba163b83ae
commit 00a5a5bd5b
9 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/CMSBatchActionHandler.php
View File

@ -66,8 +66,8 @@ class CMSBatchActionHandler extends RequestHandler {
function handleAction($request) {
// This method can't be called without ajax.
if(!$this->parentController->isAjax()) {
$this->parentController->redirectBack();
if(!Director::is_ajax()) {
Director::redirectBack();
return;
}

4
code/CMSMain.php
View File

@ -647,7 +647,7 @@ JS;
);
return ($liveRecord) ? $form->formHtmlContent() : "";
} else {
$this->redirectBack();
Director::redirectBack();
}
}
@ -917,7 +917,7 @@ JS;
SSViewer::setOption('rewriteHashlinks', false);
if($this->isAjax()) {
if(Director::is_ajax()) {
return $form->formHtmlContent();
} else {
$templateData = $this->customise(array(

2
code/GroupImportForm.php
View File

@ -83,7 +83,7 @@ class GroupImportForm extends Form {
$this->sessionMessage($msg, 'good');
$this->redirectBack();
Director::redirectBack();
}
}

6
code/LeftAndMain.php
View File

@ -120,7 +120,7 @@ class LeftAndMain extends Controller {
);
// set reading lang
if(Object::has_extension('SiteTree', 'Translatable') && !$this->isAjax()) {
if(Object::has_extension('SiteTree', 'Translatable') && !Director::is_ajax()) {
Translatable::choose_site_locale(array_keys(Translatable::get_existing_content_languages('SiteTree')));
}
@ -158,7 +158,7 @@ class LeftAndMain extends Controller {
if(Director::redirected_to()) return;
// Audit logging hook
if(empty($_REQUEST['executeForm']) && !$this->isAjax()) $this->extend('accessedCMS');
if(empty($_REQUEST['executeForm']) && !Director::is_ajax()) $this->extend('accessedCMS');
// Set the members html editor config
HtmlEditorConfig::set_active(Member::currentUser()->getHtmlEditorConfigForCMS());
@ -360,7 +360,7 @@ class LeftAndMain extends Controller {
// TODO Necessary for TableListField URLs to work properly
if($request->param('ID')) $this->setCurrentPageID($request->param('ID'));
if($this->isAjax()) {
if(Director::is_ajax()) {
SSViewer::setOption('rewriteHashlinks', false);
$form = $this->getEditForm($request->param('ID'));
$content = $form->formHtmlContent();

2
code/MemberImportForm.php
View File

@ -87,7 +87,7 @@ class MemberImportForm extends Form {
$this->sessionMessage($msg, 'good');
$this->controller->redirectBack();
Director::redirectBack();
}
/**

2
code/MemberTableField.php
View File

@ -367,7 +367,7 @@ class MemberTableField extends ComplexTableField {
);
$form->sessionMessage($message, 'good');
$this->controller->redirectBack();
Director::redirectBack();
}
/**

15
code/ModelAdmin.php
View File

@ -514,7 +514,7 @@ class ModelAdmin_CollectionController extends Controller {
// File wasn't properly uploaded, show a reminder to the user
if(empty($_FILES['_CsvFile']['tmp_name'])) {
$form->sessionMessage(_t('ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'), 'good');
$this->redirectBack();
Director::redirectBack();
return false;
}
@ -541,7 +541,7 @@ class ModelAdmin_CollectionController extends Controller {
if(!$results->CreatedCount() && !$results->UpdatedCount()) $message .= _t('ModelAdmin.NOIMPORT', "Nothing to import");
$form->sessionMessage($message, 'good');
$this->redirectBack();
Director::redirectBack();
}
/**
@ -835,7 +835,7 @@ class ModelAdmin_CollectionController extends Controller {
$form->saveInto($model);
$model->write();
if($this->isAjax()) {
if(Director::is_ajax()) {
$class = $this->parentController->getRecordControllerClass($this->getModelClass());
$recordController = new $class($this, $request, $model->ID);
return new SS_HTTPResponse(
@ -888,7 +888,7 @@ class ModelAdmin_RecordController extends Controller {
*/
function edit($request) {
if ($this->currentRecord) {
if($this->isAjax()) {
if(Director::is_ajax()) {
return new SS_HTTPResponse(
$this->EditForm()->formHtmlContent(),
200,
@ -958,10 +958,10 @@ class ModelAdmin_RecordController extends Controller {
// Behaviour switched on .
if($this->parentController->isAjax()) {
if(Director::is_ajax()) {
return $this->edit($request);
} else {
$this->parentController->redirectBack();
Director::redirectBack();
}
}
@ -972,9 +972,8 @@ class ModelAdmin_RecordController extends Controller {
if($this->currentRecord->canDelete(Member::currentUser())) {
$this->currentRecord->delete();
Director::redirect($this->parentController->Link('SearchForm?action=search'));
} else {
$this->parentController->redirectBack();
}
else Director::redirectBack();
return;
}

20
code/sitefeatures/PageComment.php
View File

@ -190,10 +190,10 @@ class PageComment_Controller extends Controller {
}
}
if($this->isAjax()) {
if(Director::is_ajax()) {
echo "";
} else {
$this->redirectBack();
Director::redirectBack();
}
}
@ -205,10 +205,10 @@ class PageComment_Controller extends Controller {
}
}
if($this->isAjax()) {
if(Director::is_ajax()) {
echo "";
} else {
$this->redirectBack();
Director::redirectBack();
}
}
@ -222,10 +222,10 @@ class PageComment_Controller extends Controller {
// @todo Report to spamprotecter this is true
if($this->isAjax()) {
if(Director::is_ajax()) {
echo $comment->renderWith('PageCommentInterface_singlecomment');
} else {
$this->redirectBack();
Director::redirectBack();
}
}
}
@ -259,14 +259,14 @@ class PageComment_Controller extends Controller {
$comment->write();
}
}
if($this->isAjax()) {
if(Director::is_ajax()) {
if(SSAkismet::isEnabled() && SSAkismet::getSaveSpam()) {
echo $comment->renderWith('PageCommentInterface_singlecomment');
} else {
echo '';
}
} else {
$this->redirectBack();
Director::redirectBack();
}
}
/**
@ -296,10 +296,10 @@ class PageComment_Controller extends Controller {
$comment->write();
}
}
if($this->isAjax()) {
if(Director::is_ajax()) {
echo $comment->renderWith('PageCommentInterface_singlecomment');
} else {
$this->redirectBack();
Director::redirectBack();
}
}

10
code/sitefeatures/PageCommentInterface.php
View File

@ -301,8 +301,8 @@ class PageCommentInterface_Form extends Form {
//check if spam question was right.
if(MathSpamProtection::isEnabled()){
if(!MathSpamProtection::correctAnswer($data['Math'])){
if(!$this->controller->isAjax()) {
$this->controller->redirectBack();
if(!Director::is_ajax()) {
Director::redirectBack();
}
return "spamprotectionfailed"; //used by javascript for checking if the spam question was wrong
}
@ -330,7 +330,7 @@ class PageCommentInterface_Form extends Form {
$comment->write();
Cookie::set("PageCommentInterface_Comment", '');
if($this->controller->isAjax()) {
if(Director::is_ajax()) {
if($comment->NeedsModeration){
echo _t('PageCommentInterface_Form.AWAITINGMODERATION', "Your comment has been submitted and is now awaiting moderation.");
} else{
@ -347,7 +347,7 @@ class PageCommentInterface_Form extends Form {
}
}
return $this->controller->redirectBack(); // worst case, just go back to the page
return Director::redirectBack(); // worst case, just go back to the page
}
}
}
@ -362,7 +362,7 @@ class PageCommentInterface_Controller extends ContentController {
}
function newspamquestion() {
if($this->isAjax()) {
if(Director::is_ajax()) {
echo Convert::raw2xml(sprintf(_t('PageCommentInterface_Controller.SPAMQUESTION', "Spam protection question: %s"),MathSpamProtection::getMathQuestion()));
}
}