tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-06-26 06:29:36 +02:00
Code Issues Projects Releases Wiki Activity

mlanthaler: Bugfix: Added isset() to prevent E_NOTICE error ($memberID isn't needed in the rest of the method).

Browse Source 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41915 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-15 20:10:43 +00:00
parent 7ee0ec6158
commit d5d2006980
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/MemberTableField.php
View File

@ -34,16 +34,16 @@ class MemberTableField extends ComplexTableField {
private static $addedFields = array(); private static $addedFields = array();
private static $addedCsvFields = array(); private static $addedCsvFields = array();
public static function addPermissions( $addingPermissionList ) { public static function addPermissions( $addingPermissionList ) {
self::$addedPermissions = $addingPermissionList; self::$addedPermissions = $addingPermissionList;
} }
public static function addMembershipFields( $addingFieldList, $addingCsvFieldList = null ) { public static function addMembershipFields( $addingFieldList, $addingCsvFieldList = null ) {
self::$addedFields = $addingFieldList; self::$addedFields = $addingFieldList;
$addingCsvFieldList == null ? self::$addedCsvFields = $addingFieldList : self::$addedCsvFields = $addingCsvFieldList; $addingCsvFieldList == null ? self::$addedCsvFields = $addingFieldList : self::$addedCsvFields = $addingCsvFieldList;
} }
function __construct($controller, $name, $group, $members = null, $hidePassword = true, $pageLimit = 10) { function __construct($controller, $name, $group, $members = null, $hidePassword = true, $pageLimit = 10) {
if($group) { if($group) {
@ -67,16 +67,16 @@ class MemberTableField extends ComplexTableField {
"Surname" => "Surname", "Surname" => "Surname",
"Email" => "Email" "Email" => "Email"
); );
$csvFieldList = $fieldList; $csvFieldList = $fieldList;
foreach( self::$addedCsvFields as $key => $value ) { foreach( self::$addedCsvFields as $key => $value ) {
$csvFieldList[$key] = $value; $csvFieldList[$key] = $value;
} }
foreach( self::$addedFields as $key => $value ) { foreach( self::$addedFields as $key => $value ) {
$fieldList[$key] = $value; $fieldList[$key] = $value;
} }
if(!$hidePassword) { if(!$hidePassword) {
$fieldList["Password"] = "Password"; $fieldList["Password"] = "Password";
} }
@ -88,7 +88,7 @@ class MemberTableField extends ComplexTableField {
} }
$detailFormFields = $SNG_member->getCMSFields(); $detailFormFields = $SNG_member->getCMSFields();
$this->detailFormValidator = $SNG_member->getValidator(); $this->detailFormValidator = $SNG_member->getValidator();
$this->pageSize = $pageLimit; $this->pageSize = $pageLimit;
// Legacy: Use setCustomSourceItems() instead. // Legacy: Use setCustomSourceItems() instead.
@ -128,7 +128,7 @@ class MemberTableField extends ComplexTableField {
} }
$this->sourceJoin = " INNER JOIN `Group_Members` ON `MemberID`=`Member`.`ID`"; $this->sourceJoin = " INNER JOIN `Group_Members` ON `MemberID`=`Member`.`ID`";
$this->setFieldListCsv( $csvFieldList ); $this->setFieldListCsv( $csvFieldList );
} }
@ -248,7 +248,7 @@ class MemberTableField extends ComplexTableField {
//if( ! $record->isInGroup( $data['ctf']['ID'] ) ) //if( ! $record->isInGroup( $data['ctf']['ID'] ) )
$record->Groups()->add( $data['ctf']['ID'] ); $record->Groups()->add( $data['ctf']['ID'] );
$this->sourceItems(); $this->sourceItems();
// TODO add javascript to highlight added row (problem: might not show up due to sorting/filtering) // TODO add javascript to highlight added row (problem: might not show up due to sorting/filtering)
@ -366,7 +366,7 @@ class MemberTableField extends ComplexTableField {
$this->totalCount = ($this->sourceItems) ? $this->sourceItems->TotalItems() : 0; $this->totalCount = ($this->sourceItems) ? $this->sourceItems->TotalItems() : 0;
return $this->sourceItems; return $this->sourceItems;
} }
function TotalCount() { function TotalCount() {
$this->sourceItems(); // Called for its side-effect of setting total count $this->sourceItems(); // Called for its side-effect of setting total count
return $this->totalCount; return $this->totalCount;