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

MINOR Removed redundant code from MemberTableField

Browse Source 
MINOR Code tidy up and coding style fixes for MemberTableField


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70236 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-01-15 22:12:12 +00:00 committed by Sam Minnee
parent b7e2a51c64
commit bf200c86b8
1 changed files with 43 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
code/MemberTableField.php
View File

@ -33,9 +33,9 @@ class MemberTableField extends ComplexTableField {
static $data_class = "Member";
protected $permissions = array(
"add",
"edit",
"delete"
'add',
'edit',
'delete'
);
private static $addedPermissions = array();
@ -54,7 +54,6 @@ class MemberTableField extends ComplexTableField {
}
function __construct($controller, $name, $group, $members = null, $hidePassword = true, $pageLimit = 10) {
if($group) {
if(is_object($group)) {
$this->group = $group;
@ -65,11 +64,11 @@ class MemberTableField extends ComplexTableField {
$this->group = DataObject::get_by_id('Group', $_REQUEST['ctf'][$this->Name()]["ID"]);
}
$sourceClass = $this->stat('data_class');
$sourceClass = $this->stat("data_class");
foreach( self::$addedPermissions as $permission )
foreach(self::$addedPermissions as $permission) {
array_push( $this->permissions, $permission );
}
$fieldList = array(
"FirstName" => _t('MemberTableField.FIRSTNAME', 'Firstname'),
@ -102,12 +101,7 @@ class MemberTableField extends ComplexTableField {
Requirements::javascript(CMS_DIR . '/javascript/MemberTableField.js');
Requirements::javascript(CMS_DIR . "/javascript/MemberTableField_popup.js");
// construct the filter and sort
if(isset($_REQUEST['MemberOrderByField'])) {
$this->sourceSort = '`' . Convert::raw2sql($_REQUEST['MemberOrderByField']) . '`' . Convert::raw2sql( $_REQUEST['MemberOrderByOrder'] );
}
$SNG_member = singleton('Member');
$SNG_member = singleton($this->stat('data_class'));
// search
$SQL_search = isset($_REQUEST['MemberSearch']) ? Convert::raw2sql($_REQUEST['MemberSearch']) : null;
@ -129,11 +123,6 @@ class MemberTableField extends ComplexTableField {
$this->setFieldListCsv( $csvFieldList );
}
/**
* Overridden functions
*/
function sourceID() {
return $this->group->ID;
}
@ -150,41 +139,16 @@ class MemberTableField extends ComplexTableField {
new HiddenField('MemberDontShowPassword', '', $this->hidePassword)
);
$orderByFields = new FieldGroup(
new LabelField('OrderByLabel',_t('MemberTableField.ORDERBY', 'Order by')),
new FieldSet(
new DropdownField('MemberOrderByField','', array(
'FirstName' => _t('MemberTableField.FIRSTNAME', 'FirstName'),
'Surname' => _t('MemberTableField.SURNAME', 'Surname'),
'Email' => _t('MemberTableField.EMAIL', 'Email')
)),
new DropdownField('MemberOrderByOrder','',array(
'ASC' => _t('MemberTableField.ASC', 'Ascending'),
'DESC' => _t('MemberTableField.DESC', 'Descending')
))
)
);
$groups = DataObject::get('Group');
$groupArray = array('' => _t('MemberTableField.ANYGROUP', 'Any group'));
foreach( $groups as $group ) {
$groupArray[$group->ID] = $group->Title;
}
$groupFields = new DropdownField('MemberGroup', _t('MemberTableField.FILTERBYGROUP', 'Filter by group'),$groupArray );
$actionFields = new LiteralField('MemberFilterButton','<input type="submit" class="action" name="MemberFilterButton" value="'._t('MemberTableField.FILTER', 'Filter').'" id="MemberFilterButton"/>');
$fieldContainer = new FieldGroup(
$searchFields,
// $orderByFields,
// $groupFields,
$actionFields
);
return $fieldContainer->FieldHolder();
}
/**
* Add existing member to group rather than creating a new member
*/
@ -239,8 +203,6 @@ class MemberTableField extends ComplexTableField {
}
/**
* #################################
* Utility Functions
@ -254,7 +216,6 @@ class MemberTableField extends ComplexTableField {
return 'GroupID';
}
/**
* #################################
* Custom Functions
@ -271,6 +232,7 @@ class MemberTableField extends ComplexTableField {
function setGroup($group) {
$this->group = $group;
}
function setController($controller) {
$this->controller = $controller;
}
@ -289,12 +251,20 @@ class MemberTableField extends ComplexTableField {
}
$fields->push(new HiddenField('ctf[ID]', null, $this->group->ID));
return new TabularStyle(new NestedForm(new Form($this, 'AddRecordForm',
$fields,
new FieldSet(
$actions = new FieldSet(
new FormAction('addtogroup', _t('MemberTableField.ADD','Add'))
);
return new TabularStyle(
new NestedForm(
new Form(
$this,
'AddRecordForm',
$fields,
$actions
)
)));
)
);
}
/**
@ -343,7 +313,6 @@ class MemberTableField extends ComplexTableField {
$limitClause = ($_REQUEST['ctf'][$this->Name()]['start']) . ", {$this->pageSize}";
} else {
$limitClause = "0, {$this->pageSize}";
}
// We use the group to get the members, as they already have the bulk of the look up functions
@ -355,8 +324,10 @@ class MemberTableField extends ComplexTableField {
$this->sourceFilter,
$this->sourceSort
);
$this->unpagedSourceItems = $this->group->Members('', '', $this->sourceFilter, $this->sourceSort);
$this->totalCount = ($this->sourceItems) ? $this->sourceItems->TotalItems() : 0;
return $this->sourceItems;
}