From a9d6dec5ecd3d8d1d7379bd097130216160ca606 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 11 Feb 2010 00:43:23 +0000 Subject: [PATCH] FEATURE Import members and their group assignments from CSV in admin/security through the new MemberImportForm class (merged from r98708) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98732 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/MemberImportForm.php | 84 +++++++++++++++++++++++++++++++ code/SecurityAdmin.php | 48 +++++++++++++++++- javascript/SecurityAdmin_right.js | 29 ++++++++++- tests/MemberImportFormTest.php | 21 ++++++++ tests/MemberImportFormTest.yml | 3 ++ 5 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 code/MemberImportForm.php create mode 100644 tests/MemberImportFormTest.php create mode 100644 tests/MemberImportFormTest.yml diff --git a/code/MemberImportForm.php b/code/MemberImportForm.php new file mode 100644 index 00000000..85da09a8 --- /dev/null +++ b/code/MemberImportForm.php @@ -0,0 +1,84 @@ +(Allowed extensions: *.csv)' + ) + ) + ); + $fileField->setAllowedExtensions(array('csv')); + } + + if(!$actions) $actions = new FieldSet( + new FormAction('doImport', _t('SecurityAdmin_MemberImportForm.BtnImport', 'Import')) + ); + + if(!$validator) $validator = new RequiredFields('CsvFile'); + + + parent::__construct($controller, $name, $fields, $actions, $validator); + } + + function doImport($data, $form) { + $loader = new MemberCsvBulkLoader(); + + // optionally set group relation + if($this->group) $loader->setGroups(array($this->group)); + + // load file + $result = $loader->load($data['CsvFile']['tmp_name']); + + // result message + $msgArr = array(); + if($result->CreatedCount()) $msgArr[] = sprintf( + _t('MemberImportForm.ResultCreated', 'Created %d members'), + $result->CreatedCount() + ); + if($result->UpdatedCount()) $msgArr[] = sprintf( + _t('MemberImportForm.ResultUpdated', 'Updated %d members'), + $result->UpdatedCount() + ); + if($result->DeletedCount()) $msgArr[] = sprintf( + _t('MemberImportForm.ResultDeleted', 'Deleted %d members'), + $result->DeletedCount() + ); + $msg = ($msgArr) ? implode(',', $msgArr) : _t('MemberImportForm.ResultNone', 'No changes'); + + $this->sessionMessage($msg, 'good'); + + Director::redirectBack(); + } + + /** + * @param $group Group + */ + function setGroup($group) { + $this->group = $group; + } + + /** + * @return Group + */ + function getGroup($group) { + return $this->group; + } +} +?> \ No newline at end of file diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php index 6400013a..784caf75 100644 --- a/code/SecurityAdmin.php +++ b/code/SecurityAdmin.php @@ -24,7 +24,9 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider { 'savemember', 'AddRecordForm', 'MemberForm', - 'EditForm' + 'EditForm', + 'MemberImportForm', + 'memberimport' ); /** @@ -75,6 +77,21 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider { $form = new Form($this, "EditForm", $fields, $actions); $form->loadDataFrom($record); + $fields = $form->Fields(); + + if($fields->hasTabSet()) { + $fields->findOrMakeTab('Root.Import',_t('Group.IMPORTTABTITLE', 'Import')); + $fields->addFieldToTab('Root.Import', + new LiteralField( + 'MemberImportFormIframe', + sprintf( + '', + $this->Link('memberimport') + ) + ) + ); + } + if(!$record->canEdit()) { $readonlyFields = $form->Fields()->makeReadonly(); $form->setFields($readonlyFields); @@ -86,6 +103,35 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider { return $form; } + + public function memberimport() { + Requirements::clear(); + Requirements::css(SAPPHIRE_DIR . '/css/Form.css'); + Requirements::css(CMS_DIR . '/css/typography.css'); + Requirements::css(CMS_DIR . '/css/cms_right.css'); + + Requirements::javascript(CMS_DIR . '/javascript/MemberImportForm.js'); + + return $this->renderWith('BlankPage', array( + 'Form' => $this->MemberImportForm() + )); + } + + /** + * @see SecurityAdmin_MemberImportForm + * + * @return Form + */ + public function MemberImportForm() { + $group = $this->currentPage(); + $form = new MemberImportForm( + $this, + 'MemberImportForm' + ); + $form->setGroup($group); + + return $form; + } public function AddRecordForm() { $m = Object::create('MemberTableField', diff --git a/javascript/SecurityAdmin_right.js b/javascript/SecurityAdmin_right.js index 03daad63..e9e8e163 100755 --- a/javascript/SecurityAdmin_right.js +++ b/javascript/SecurityAdmin_right.js @@ -6,4 +6,31 @@ function action_addmember_right() { var tables = document.getElementsBySelector('#Form_EditForm div.MemberTableField table'); var addLinks = document.getElementsBySelector('#Form_EditForm div.MemberTableField a.addlink'); memberTableFields[0].openPopup(null,addLinks[0].href,tables[0]); -} \ No newline at end of file +} + +(function($) { + $(document).ready(function() { + var refreshAfterImport = function(e) { + // Check for a message
, an indication that the form has been submitted. + var existingFormMessage = $($(this).contents()).find('.message'); + if(existingFormMessage && existingFormMessage.html()) { + // Refresh member listing + var memberTableField = $(window.parent.document).find('#Form_EditForm_Members').get(0); + if(memberTableField) memberTableField.refresh(); + + // Refresh tree + var tree = $(window.parent.document).find('#sitetree').get(0); + if(tree) tree.reload(); + } + }; + + /** + * Refresh the member listing every time the import iframe is loaded, + * which is most likely a form submission. + */ + $('#MemberImportFormIframe,#GroupImportFormIframe').livequery( + 'load', + refreshAfterImport + ); + }) +})(jQuery); \ No newline at end of file diff --git a/tests/MemberImportFormTest.php b/tests/MemberImportFormTest.php new file mode 100644 index 00000000..4426a951 --- /dev/null +++ b/tests/MemberImportFormTest.php @@ -0,0 +1,21 @@ + array( + 'tmp_name' => 'cms/tests/MemberImportFormTest.yml' + ) + ); + $form->doImport($data, $form); + } + +} \ No newline at end of file diff --git a/tests/MemberImportFormTest.yml b/tests/MemberImportFormTest.yml new file mode 100644 index 00000000..94463f79 --- /dev/null +++ b/tests/MemberImportFormTest.yml @@ -0,0 +1,3 @@ +FirstName,Surname,Email,Password,PasswordEncryption,Salt,PasswordExpiry,Groups +author1_first,author1_last,author1@test.com,21bb196c4d488023cb4e4b9df5f687c9a4d40172,sha1_v2.4,c23a94a878aa825cee69136bfd6185a874bc68801257978194,,existinggroup +author2_first,author2_last,author2@test.com,069b6b22dcaded75c045b7e5ceb5d1dd743f9cac,sha1_v2.4,7e8ea602668b5631bac4baaf7174f9966b6d34571257978210,,"existinggroup,newgroup" \ No newline at end of file