tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

API CHANGE Using Controller::join_links() to construct links in ComplexTableField and TableListField (partially merged from r88495, r96775)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@113321 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-11-01 04:58:59 +00:00 committed by Sam Minnee
parent 09d25b0d70
commit 2d1d5363c8
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
forms/ComplexTableField.php
View File

@ -364,7 +364,7 @@ JS;
function AddLink() {
return $this->Link() . '/add';
return Controller::join_links($this->Link(), 'add');
}
/**
@ -651,7 +651,7 @@ JS;
$message = sprintf(
_t('ComplexTableField.SUCCESSADD', 'Added %s %s %s'),
$childData->singular_name(),
'<a href="' . $this->Link() . '/item/' . $childData->ID . '/edit">' . $childData->Title . '</a>',
'<a href="' . Controller::join_links($this->Link(), 'item', $childData->ID, 'edit') . '">' . $childData->Title . '</a>',
$closeLink
);
@ -675,7 +675,7 @@ class ComplexTableField_ItemRequest extends RequestHandler {
);
function Link() {
return $this->ctf->Link() . '/item/' . $this->itemID;
return Controller::join_links($this->ctf->Link(), 'item', $this->itemID);
}
function __construct($ctf, $itemID) {
@ -838,7 +838,7 @@ class ComplexTableField_ItemRequest extends RequestHandler {
}
$start = 0;
return Controller::join_links($this->Link(), "$this->methodName?ctf[start]={$start}");
return Controller::join_links($this->Link(), $this->methodName, "?ctf[start]={$start}");
}
function PopupLastLink() {
@ -847,7 +847,7 @@ class ComplexTableField_ItemRequest extends RequestHandler {
}
$start = $this->totalCount - 1;
return Controller::join_links($this->Link(), "$this->methodName?ctf[start]={$start}");
return Controller::join_links($this->Link(), $this->methodName, "?ctf[start]={$start}");
}
function PopupNextLink() {
@ -856,7 +856,7 @@ class ComplexTableField_ItemRequest extends RequestHandler {
}
$start = $_REQUEST['ctf']['start'] + 1;
return Controller::join_links($this->Link(), "$this->methodName?ctf[start]={$start}");
return Controller::join_links($this->Link(), $this->methodName, "?ctf[start]={$start}");
}
function PopupPrevLink() {
@ -865,7 +865,7 @@ class ComplexTableField_ItemRequest extends RequestHandler {
}
$start = $_REQUEST['ctf']['start'] - 1;
return Controller::join_links($this->Link(), "$this->methodName?ctf[start]={$start}");
return Controller::join_links($this->Link(), $this->methodName, "?ctf[start]={$start}");
}
/**
@ -888,7 +888,7 @@ class ComplexTableField_ItemRequest extends RequestHandler {
}
for($i = $offset;$i <= $offset + $this->pageSize && $i <= $this->totalCount;$i++) {
$start = $i - 1;
$links['link'] = Controller::join_links($this->Link() . "$this->methodName?ctf[start]={$start}");
$links['link'] = Controller::join_links($this->Link(), $this->methodName, "?ctf[start]={$start}");
$links['number'] = $i;
$links['active'] = $i == $currentItem ? false : true;
$result->push(new ArrayData($links));
@ -988,19 +988,19 @@ class ComplexTableField_Item extends TableListField_Item {
}
function Link() {
return $this->parent->Link() . '/item/' . $this->item->ID;
return Controller::join_links($this->parent->Link(), 'item', $this->item->ID);
}
function EditLink() {
return $this->Link() . "/edit";
return Controller::join_links($this->Link(), "edit");
}
function ShowLink() {
return $this->Link() . "/show";
return Controller::join_links($this->Link(), "show");
}
function DeleteLink() {
return $this->Link() . "/delete";
return Controller::join_links($this->Link(), "delete");
}
/**