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

(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60335 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-08-11 03:10:59 +00:00
parent 393c0a78e8
commit 382f34c69b
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/TestRunner.php
View File

@ -58,7 +58,6 @@ class TestRunner extends Controller {
* Run all test classes * Run all test classes
*/ */
function all() { function all() {
die("here");
if(hasPhpUnit()) { if(hasPhpUnit()) {
$tests = ClassInfo::subclassesFor('SapphireTest'); $tests = ClassInfo::subclassesFor('SapphireTest');
array_shift($tests); array_shift($tests);
@ -127,10 +126,8 @@ class TestRunner extends Controller {
$results = new PHPUnit_Framework_TestResult(); $results = new PHPUnit_Framework_TestResult();
$results->addListener($reporter); $results->addListener($reporter);
/*, array("reportDirectory" => "/Users/sminnee/phpunit-report")*/
if($coverage) { if($coverage) {
$suite->run($results); $suite->run($results);
//$testResult = PHPUnit_TextUI_TestRunner::run($suite, array("reportDirectory" => "../assets/coverage-report"));
$coverageURL = Director::absoluteURL('assets/coverage-report'); $coverageURL = Director::absoluteURL('assets/coverage-report');
echo "<p><a href=\"$coverageURL\">Coverage report available here</a></p>"; echo "<p><a href=\"$coverageURL\">Coverage report available here</a></p>";
} else { } else {

8
forms/FieldGroup.php
View File

@ -57,18 +57,16 @@ class FieldGroup extends CompositeField {
* it is easier to overwrite the <div class="field"> behaviour in a more specific class * it is easier to overwrite the <div class="field"> behaviour in a more specific class
*/ */
function Field() { function Field() {
$subfieldParam = $this->subfieldParam;
$fs = $this->FieldSet(); $fs = $this->FieldSet();
$spaceZebra = isset($this->zebra) ? " $this->zebra" : ''; $spaceZebra = isset($this->zebra) ? " $this->zebra" : '';
$idAtt = isset($this->id) ? " id=\"{$this->id}\"" : ''; $idAtt = isset($this->id) ? " id=\"{$this->id}\"" : '';
$content = "<span class=\"fieldgroup$spaceZebra\"$idAtt>"; $content = "<div class=\"fieldgroup$spaceZebra\"$idAtt>";
foreach($fs as $subfield) { foreach($fs as $subfield) {
$childZebra = (!isset($childZebra) || $childZebra == "odd") ? "even" : "odd"; $childZebra = (!isset($childZebra) || $childZebra == "odd") ? "even" : "odd";
if($subfield->hasMethod('setZebra')) $subfield->setZebra($childZebra); if($subfield->hasMethod('setZebra')) $subfield->setZebra($childZebra);
$content .= $subfield->$subfieldParam() . " "; $content .= "<div class=\"fieldgroupField\">" . $subfield->{$this->subfieldParam}() . "</div>";
} }
$content .= "</span>"; $content .= "</div>";
return $content; return $content;
} }

2
security/Member.php
View File

@ -699,7 +699,7 @@ $_REQUEST['showqueries'] = 1;
public function Groups() { public function Groups() {
$groups = $this->getManyManyComponents("Groups"); $groups = $this->getManyManyComponents("Groups");
$unsecure = DataObject::get("Group_Unsecure", ""); $unsecure = DataObject::get("Group_Unsecure");
if($unsecure) { if($unsecure) {
foreach($unsecure as $unsecureItem) { foreach($unsecure as $unsecureItem) {
$groups->push($unsecureItem); $groups->push($unsecureItem);