From a99d7b0b1dd2885e5072e76ef6f99f2f73603634 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 16 Mar 2011 10:59:19 +1300 Subject: [PATCH] API CHANGE Removed CMSBatchAction->getDoingText(), the same information can be visualized via a spinner button without this overhead --- code/AssetAdmin.php | 3 --- code/CMSBatchAction.php | 12 ------------ code/CMSBatchActionHandler.php | 2 -- 3 files changed, 17 deletions(-) diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index 2b8a0d43..29cdca25 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -510,9 +510,6 @@ class AssetAdmin_DeleteBatchAction extends CMSBatchAction { // _t('AssetAdmin_left.ss.SELECTTODEL','Select the folders that you want to delete and then click the button below') return _t('AssetAdmin_DeleteBatchAction.TITLE', 'Delete folders'); } - function getDoingText() { - return _t('AssetAdmin_DeletingBatchAction.TITLE', 'Deleting folders'); - } function run(DataObjectSet $records) { $status = array( diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php index 990e7355..27e0454f 100644 --- a/code/CMSBatchAction.php +++ b/code/CMSBatchAction.php @@ -139,9 +139,6 @@ class CMSBatchAction_Publish extends CMSBatchAction { function getActionTitle() { return _t('CMSBatchActions.PUBLISH_PAGES', 'Publish'); } - function getDoingText() { - return _t('CMSBatchActions.PUBLISHING_PAGES', 'Publishing selected pages'); - } function run(DataObjectSet $pages) { return $this->batchaction($pages, 'doPublish', @@ -164,9 +161,6 @@ class CMSBatchAction_Unpublish extends CMSBatchAction { function getActionTitle() { return _t('CMSBatchActions.UNPUBLISH_PAGES', 'Un-publish'); } - function getDoingText() { - return _t('CMSBatchActions.UNPUBLISHING_PAGES', 'Un-publishing selected pages'); - } function run(DataObjectSet $pages) { return $this->batchaction($pages, 'doUnpublish', @@ -185,9 +179,6 @@ class CMSBatchAction_Delete extends CMSBatchAction { function getActionTitle() { return _t('CMSBatchActions.DELETE_DRAFT_PAGES', 'Delete from draft site'); } - function getDoingText() { - return _t('CMSBatchActions.DELETING_DRAFT_PAGES', 'Deleting selected pages from the draft site'); - } function run(DataObjectSet $pages) { $status = array( @@ -235,9 +226,6 @@ class CMSBatchAction_DeleteFromLive extends CMSBatchAction { function getActionTitle() { return _t('CMSBatchActions.DELETE_PAGES', 'Delete from published site'); } - function getDoingText() { - return _t('CMSBatchActions.DELETING_PAGES', 'Deleting selected pages from the published site'); - } function run(DataObjectSet $pages) { $status = array( diff --git a/code/CMSBatchActionHandler.php b/code/CMSBatchActionHandler.php index 85f46714..2fe77e03 100644 --- a/code/CMSBatchActionHandler.php +++ b/code/CMSBatchActionHandler.php @@ -170,7 +170,6 @@ class CMSBatchActionHandler extends RequestHandler { * about each batch action: * - Link * - Title - * - DoingText */ function batchActionList() { $actions = $this->batchActions(); @@ -183,7 +182,6 @@ class CMSBatchActionHandler extends RequestHandler { $actionDef = new ArrayData(array( "Link" => Controller::join_links($this->Link(), $urlSegment), "Title" => $actionObj->getActionTitle(), - "DoingText" => $actionObj->getDoingText(), )); $actionList->push($actionDef); }