mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-02 22:28:38 +02:00
ENHANCEMENT Show at most, 100 members in a group before paging required instead of 10
MINOR Removed setting of permissions since this never worked - use MemberTableField->setPermissions() instead MINOR Deprecated the use of addMembershipFields() - use updateSummaryFields() on your Member decorator instead MINOR Removed redundant code that wasn't being used git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71388 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey
parent
bcbdfe2a13
commit
c4d3abcc29
@ -6,6 +6,8 @@
|
||||
* In contrast to the original implementation, the URL-parameters "ParentClass" and "ParentID" are used
|
||||
* to specify "Group" (hardcoded) and the GroupID-relation.
|
||||
*
|
||||
* @todo write a better description about what this field does.
|
||||
*
|
||||
* Returns either:
|
||||
* - provided members
|
||||
* - members of a provided group
|
||||
@ -20,68 +22,64 @@ class MemberTableField extends ComplexTableField {
|
||||
|
||||
protected $hidePassword;
|
||||
|
||||
protected $pageSize;
|
||||
|
||||
protected $detailFormValidator;
|
||||
|
||||
protected $group;
|
||||
|
||||
protected $template = "MemberTableField";
|
||||
protected $template = 'MemberTableField';
|
||||
|
||||
public $popupClass = 'MemberTableField_Popup';
|
||||
|
||||
static $data_class = "Member";
|
||||
|
||||
protected $permissions = array(
|
||||
'add',
|
||||
'edit',
|
||||
'delete'
|
||||
);
|
||||
|
||||
private static $addedPermissions = array();
|
||||
static $data_class = 'Member';
|
||||
|
||||
/**
|
||||
* @deprecated 2.4: See {@link MemberTableField->addMembershipFields()}
|
||||
*/
|
||||
private static $addedFields = array();
|
||||
|
||||
/**
|
||||
* @deprecated 2.4: See {@link MemberTableField->addMembershipFields()}
|
||||
*/
|
||||
private static $addedCsvFields = array();
|
||||
|
||||
public static function addPermissions($addingPermissionList) {
|
||||
self::$addedPermissions = $addingPermissionList;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated 2.4: Please use a DataObjectDecorator, implementing updateSummaryFields
|
||||
* to alter the table overview fields instead.
|
||||
*/
|
||||
public static function addMembershipFields($addingFieldList, $addingCsvFieldList = null) {
|
||||
trigger_error('MemberTableField::addMembershipFields() is deprecated. Please implement updateSummaryFields() on a Member decorator instead.', E_USER_NOTICE);
|
||||
self::$addedFields = $addingFieldList;
|
||||
$addingCsvFieldList == null ? self::$addedCsvFields = $addingFieldList : self::$addedCsvFields = $addingCsvFieldList;
|
||||
}
|
||||
|
||||
function __construct($controller, $name, $group, $members = null, $hidePassword = true, $pageLimit = 10) {
|
||||
/**
|
||||
* Constructor method for MemberTableField.
|
||||
*
|
||||
* @param Controller $controller Controller class which created this field
|
||||
* @param string $name Name of the field (e.g. "Members")
|
||||
* @param mixed $group Can be the ID of a Group instance, or a Group instance itself
|
||||
* @param DataObjectSet $members Optional set of Members to set as the source items for this field
|
||||
* @param boolean $hidePassword Hide the password field or not in the summary?
|
||||
*/
|
||||
function __construct($controller, $name, $group, $members = null, $hidePassword = true) {
|
||||
$sourceClass = self::$data_class;
|
||||
$SNG_member = singleton($sourceClass);
|
||||
$fieldList = $SNG_member->summaryFields();
|
||||
$memberDbFields = $SNG_member->db();
|
||||
$csvFieldList = array();
|
||||
|
||||
foreach($memberDbFields as $field => $dbFieldType) {
|
||||
$csvFieldList[$field] = $field;
|
||||
}
|
||||
|
||||
if($group) {
|
||||
if(is_object($group)) {
|
||||
$this->group = $group;
|
||||
} elseif(is_numeric($group)) {
|
||||
$this->group = DataObject::get_by_id('Group', $group);
|
||||
}
|
||||
} else if(is_numeric($_REQUEST['ctf'][$this->Name()]["ID"])) {
|
||||
$this->group = DataObject::get_by_id('Group', $_REQUEST['ctf'][$this->Name()]["ID"]);
|
||||
}
|
||||
|
||||
$sourceClass = $this->stat('data_class');
|
||||
$SNG_member = singleton($this->stat('data_class'));
|
||||
|
||||
foreach(self::$addedPermissions as $permission) {
|
||||
array_push($this->permissions, $permission);
|
||||
}
|
||||
|
||||
$fieldList = array(
|
||||
"FirstName" => _t('MemberTableField.FIRSTNAME', 'Firstname'),
|
||||
"Surname" => _t('MemberTableField.SURNAME', 'Surname'),
|
||||
"Email" => _t('MemberTableField.EMAIL', 'Email')
|
||||
);
|
||||
|
||||
$memberDbFields = $SNG_member->db();
|
||||
$csvFieldList = array();
|
||||
|
||||
foreach($memberDbFields as $field => $dbFieldType) {
|
||||
$csvFieldList[$field] = $field;
|
||||
} elseif(is_numeric($_REQUEST['ctf'][$this->Name()]['ID'])) {
|
||||
$this->group = DataObject::get_by_id('Group', $_REQUEST['ctf'][$this->Name()]['ID']);
|
||||
}
|
||||
|
||||
foreach(self::$addedFields as $key => $value) {
|
||||
@ -92,19 +90,19 @@ class MemberTableField extends ComplexTableField {
|
||||
$fieldList["SetPassword"] = "Password";
|
||||
}
|
||||
|
||||
// Legacy: Use setCustomSourceItems() instead.
|
||||
if($members) {
|
||||
$this->customSourceItems = $this->memberListWithGroupID($members, $group);
|
||||
}
|
||||
|
||||
$this->hidePassword = $hidePassword;
|
||||
|
||||
// @todo shouldn't this use $this->group? It's unclear exactly
|
||||
// what group it should be customising the custom Member set with.
|
||||
if($members) {
|
||||
$this->setCustomSourceItems($this->memberListWithGroupID($members, $group));
|
||||
}
|
||||
|
||||
parent::__construct($controller, $name, $sourceClass, $fieldList);
|
||||
|
||||
Requirements::javascript(CMS_DIR . '/javascript/MemberTableField.js');
|
||||
Requirements::javascript(CMS_DIR . "/javascript/MemberTableField_popup.js");
|
||||
Requirements::javascript(CMS_DIR . '/javascript/MemberTableField_popup.js');
|
||||
|
||||
// search
|
||||
$SQL_search = isset($_REQUEST['MemberSearch']) ? Convert::raw2sql($_REQUEST['MemberSearch']) : null;
|
||||
if(!empty($_REQUEST['MemberSearch'])) {
|
||||
$searchFilters = array();
|
||||
@ -114,14 +112,9 @@ class MemberTableField extends ComplexTableField {
|
||||
$this->sourceFilter[] = '(' . implode(' OR ', $searchFilters) . ')';
|
||||
}
|
||||
|
||||
// filter by groups
|
||||
// TODO Not implemented yet
|
||||
if(isset($_REQUEST['ctf'][$this->Name()]['GroupID']) && is_numeric($_REQUEST['ctf'][$this->Name()]['GroupID'])) {
|
||||
$this->sourceFilter[] = "\"GroupID\"='{$_REQUEST['ctf'][$this->Name()]['GroupID']}'";
|
||||
}
|
||||
|
||||
$this->sourceJoin = " INNER JOIN \"Group_Members\" ON \"MemberID\"=\"Member\".\"ID\"";
|
||||
$this->setFieldListCsv($csvFieldList);
|
||||
$this->setPageSize(100);
|
||||
}
|
||||
|
||||
function sourceID() {
|
||||
@ -135,7 +128,7 @@ class MemberTableField extends ComplexTableField {
|
||||
function SearchForm() {
|
||||
$searchFields = new FieldGroup(
|
||||
new TextField('MemberSearch', _t('MemberTableField.SEARCH', 'Search')),
|
||||
new HiddenField("ctf[ID]", '', $this->group->ID),
|
||||
new HiddenField('ctf[ID]', '', $this->group->ID),
|
||||
new HiddenField('MemberFieldName', '', $this->name),
|
||||
new HiddenField('MemberDontShowPassword', '', $this->hidePassword)
|
||||
);
|
||||
@ -162,7 +155,7 @@ class MemberTableField extends ComplexTableField {
|
||||
FormResponse::status_messsage(_t('MemberTableField.ADDINGFIELD', 'Adding failed'), 'bad');
|
||||
}
|
||||
|
||||
$className = Object::getCustomClass($this->stat('data_class'));
|
||||
$className = self::$data_class;
|
||||
$record = new $className();
|
||||
|
||||
$record->update($data);
|
||||
@ -222,6 +215,15 @@ class MemberTableField extends ComplexTableField {
|
||||
* Custom Functions
|
||||
* #################################
|
||||
*/
|
||||
|
||||
/**
|
||||
* Customise an existing DataObjectSet of Member
|
||||
* objects with a GroupID.
|
||||
*
|
||||
* @param DataObjectSet $members Set of Member objects to customise
|
||||
* @param Group $group Group object to customise with
|
||||
* @return DataObjectSet Customised set of Member objects
|
||||
*/
|
||||
function memberListWithGroupID($members, $group) {
|
||||
$newMembers = new DataObjectSet();
|
||||
foreach($members as $member) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user