tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merged revisions 50488 via svnmerge from 

http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50488 | sminnee | 2008-03-03 21:59:09 +1300 (Mon, 03 Mar 2008) | 1 line
  
  #2280 - Fixed XML parsing errors in CTF
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50870 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-03-11 01:31:38 +00:00
parent 11074f013f
commit a0be727cc3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
forms/ComplexTableField.php
View File

@ -477,7 +477,7 @@ JS;
$item = $this->unpagedSourceItems->First(); $item = $this->unpagedSourceItems->First();
$start = 0; $start = 0;
return $this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}"; return Convert::raw2att($this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}");
} }
function PopupLastLink() { function PopupLastLink() {
@ -487,7 +487,7 @@ JS;
$item = $this->unpagedSourceItems->Last(); $item = $this->unpagedSourceItems->Last();
$start = $this->totalCount - 1; $start = $this->totalCount - 1;
return $this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}"; return Convert::raw2att($this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}");
} }
function PopupNextLink() { function PopupNextLink() {
@ -498,7 +498,7 @@ JS;
$item = $this->unpagedSourceItems->getOffset($_REQUEST['ctf']['start'] + 1); $item = $this->unpagedSourceItems->getOffset($_REQUEST['ctf']['start'] + 1);
$start = $_REQUEST['ctf']['start'] + 1; $start = $_REQUEST['ctf']['start'] + 1;
return $this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}"; return Convert::raw2att($this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}");
} }
function PopupPrevLink() { function PopupPrevLink() {
@ -509,7 +509,7 @@ JS;
$item = $this->unpagedSourceItems->getOffset($_REQUEST['ctf']['start'] - 1); $item = $this->unpagedSourceItems->getOffset($_REQUEST['ctf']['start'] - 1);
$start = $_REQUEST['ctf']['start'] - 1; $start = $_REQUEST['ctf']['start'] - 1;
return $this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}"; return Convert::raw2att($this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}");
} }
/** /**
@ -533,7 +533,7 @@ JS;
for($i = $offset;$i <= $offset + $this->pageSize && $i <= $this->totalCount;$i++) { for($i = $offset;$i <= $offset + $this->pageSize && $i <= $this->totalCount;$i++) {
$start = $i - 1; $start = $i - 1;
$item = $this->unpagedSourceItems->getOffset($i-1); $item = $this->unpagedSourceItems->getOffset($i-1);
$links['link'] = $this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}"; $links['link'] = Convert::raw2att($this->PopupBaseLink() . "&methodName={$_REQUEST['methodName']}&ctf[childID]={$item->ID}&ctf[start]={$start}");
$links['number'] = $i; $links['number'] = $i;
$links['active'] = $i == $currentItem ? false : true; $links['active'] = $i == $currentItem ? false : true;
$result->push(new ArrayData($links)); $result->push(new ArrayData($links));
@ -566,7 +566,7 @@ JS;
} }
function AddLink() { function AddLink() {
return "{$this->PopupBaseLink()}&methodName=add"; return Convert::raw2att("{$this->PopupBaseLink()}&methodName=add");
} }
/** /**
@ -671,15 +671,15 @@ class ComplexTableField_Item extends TableListField_Item {
} }
function EditLink() { function EditLink() {
return $this->PopupBaseLink() . "&methodName=edit"; return Convert::raw2att($this->PopupBaseLink() . "&methodName=edit");
} }
function ShowLink() { function ShowLink() {
return $this->PopupBaseLink() . "&methodName=show"; return Convert::raw2att($this->PopupBaseLink() . "&methodName=show");
} }
function DeleteLink() { function DeleteLink() {
return $this->PopupBaseLink() . "&methodName=delete"; return Convert::raw2att($this->PopupBaseLink() . "&methodName=delete");
} }
} }

2
forms/TableListField.php
View File

@ -242,7 +242,7 @@ JS
"Name" => $fieldName, "Name" => $fieldName,
"Title" => $fieldTitle, "Title" => $fieldTitle,
"IsSortable" => $isSortable, "IsSortable" => $isSortable,
"SortLink" => $sortLink, "SortLink" => Convert::raw2xml($sortLink),
"SortBy" => $isSorted, "SortBy" => $isSorted,
"SortDirection" => (isset($_REQUEST['ctf'][$this->Name()]['dir'])) ? $_REQUEST['ctf'][$this->Name()]['dir'] : null "SortDirection" => (isset($_REQUEST['ctf'][$this->Name()]['dir'])) ? $_REQUEST['ctf'][$this->Name()]['dir'] : null
)); ));

2
templates/ComplexTableField.ss
View File

@ -11,7 +11,7 @@
<a href="$SortLink">$Title</a> <a href="$SortLink">$Title</a>
</span> </span>
<span class="sortLink <% if SortBy %><% else %>sortLinkHidden<% end_if %>"> <span class="sortLink <% if SortBy %><% else %>sortLinkHidden<% end_if %>">
<a href="$SortLink""> <a href="$SortLink">
<% if SortDirection = desc %> <% if SortDirection = desc %>
<img src="cms/images/bullet_arrow_up.png" alt="<% _t('SORTASC', 'Sort ascending') %>" /> <img src="cms/images/bullet_arrow_up.png" alt="<% _t('SORTASC', 'Sort ascending') %>" />
<% else %> <% else %>