MINOR Tidied up AssetAdmin functions

MINOR Removed commented out junk
 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65897 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2008-11-14 00:45:32 +00:00
parent 19ce25e146
commit f5a5002f14

View File

@ -521,22 +521,16 @@ JS;
* Otherwise, it will redirect back. * Otherwise, it will redirect back.
*/ */
public function returnItemToUser($p) { public function returnItemToUser($p) {
if($_REQUEST['ajax']) { if(!empty($_REQUEST['ajax'])) {
$parentID = (int)$p->ParentID; $parentID = (int)$p->ParentID;
return <<<JS return <<<JS
tree = $('sitetree'); tree = $('sitetree');
var newNode = tree.createTreeNode($p->ID, "$p->Title", "$p->class"); var newNode = tree.createTreeNode($p->ID, "$p->Title", "$p->class");
tree.getTreeNodeByIdx($parentID).appendTreeNode(newNode); tree.getTreeNodeByIdx($parentID).appendTreeNode(newNode);
newNode.selectTreeNode(); newNode.selectTreeNode();
JS; JS;
} else { } else {
Director::redirectBack(); Director::redirectBack();
} }
} }
@ -547,86 +541,26 @@ JS;
$script = ''; $script = '';
$ids = split(' *, *', $_REQUEST['csvIDs']); $ids = split(' *, *', $_REQUEST['csvIDs']);
$script = ''; $script = '';
if(!$ids) return false;
foreach($ids as $id) { foreach($ids as $id) {
$record = DataObject::get_by_id($this->stat('tree_class'), (int) $id);
if(is_numeric($id)) { if($record) {
$record = DataObject::get_by_id($this->stat('tree_class'), $id);
if(!$record)
Debug::message( "Record appears to be null" );
/*if($record->hasMethod('BackLinkTracking')) {
$brokenPages = $record->BackLinkTracking();
foreach($brokenPages as $brokenPage) {
$brokenPageList .= "<li style=\"font-size: 65%\">" . $brokenPage->Breadcrumbs(3, true) . "</li>";
$brokenPage->HasBrokenLink = true;
$notifications[$brokenPage->OwnerID][] = $brokenPage;
$brokenPage->write();
}
}*/
$record->delete(); $record->delete();
$record->destroy(); $record->destroy();
// DataObject::delete_by_id($this->stat('tree_class'), $id);
$script .= $this->deleteTreeNodeJS($record); $script .= $this->deleteTreeNodeJS($record);
} }
} }
/*if($notifications) foreach($notifications as $memberID => $pages) {
$email = new Page_BrokenLinkEmail();
$email->populateTemplate(new ArrayData(array(
"Recipient" => DataObject::get_by_id("Member", $memberID),
"BrokenPages" => new DataObjectSet($pages),
)));
$email->debug();
$email->send();
}*/
/*
$s = (sizeof($ids) > 1) ? "s" :"";
$message = sizeof($ids) . " folder$s deleted.";
//
if(isset($brokenPageList)) $message .= " The following pages now have broken links:<ul>" . addslashes($brokenPageList) . "</ul>Their owners have been emailed and they will fix up those pages.";
*/
$size = sizeof($ids); $size = sizeof($ids);
if($size > 1) if($size > 1) $message = $size . ' ' . _t('AssetAdmin.FOLDERSDELETED', 'folders deleted.');
$message = $size.' '._t('AssetAdmin.FOLDERSDELETED', 'folders deleted.'); else $message = $size . ' ' . _t('AssetAdmin.FOLDERDELETED', 'folder deleted.');
else
$message = $size.' '._t('AssetAdmin.FOLDERDELETED', 'folder deleted.');
if(isset($brokenPageList)) if(isset($brokenPageList)) {
$message .= ' '._t('AssetAdmin.NOWBROKEN', 'The following pages now have broken links:').'<ul>'.addslashes($brokenPageList).'</ul>'. $message .= ' '._t('AssetAdmin.NOWBROKEN', 'The following pages now have broken links:').'<ul>'.addslashes($brokenPageList).'</ul>'.
_t('AssetAdmin.NOWBROKEN2', 'Their owners have been emailed and they will fix up those pages.'); _t('AssetAdmin.NOWBROKEN2', 'Their owners have been emailed and they will fix up those pages.');
}
$script .= "statusMessage('$message');"; $script .= "statusMessage('$message');";
echo $script; echo $script;