From 5b2e4c71e9fc124cd5bddf1aa129f7d14434a237 Mon Sep 17 00:00:00 2001 From: Sebastian Marcet Date: Fri, 5 Dec 2014 16:06:38 -0300 Subject: [PATCH] [smarcet] - #7872 * fix on groups and companies --- openstack/code/Company.php | 4 ++++ openstack/code/GroupDecorator.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/openstack/code/Company.php b/openstack/code/Company.php index 2fd49a3..4fa24aa 100644 --- a/openstack/code/Company.php +++ b/openstack/code/Company.php @@ -534,6 +534,10 @@ class Company extends DataObject implements PermissionProvider { return $this->CompanyAdminID == $MemberID || Permission::check("DELETE_COMPANY") || $this->PermissionCheck(array("DELETE_COMPANY")); } + public function canView($member = null) { + $MemberID = Member::currentUserID(); + return $this->CompanyAdminID == $MemberID || Permission::check("EDIT_COMPANY") || $this->PermissionCheck(array("EDIT_COMPANY")); + } /* * Helper method to check if current user has the permissions diff --git a/openstack/code/GroupDecorator.php b/openstack/code/GroupDecorator.php index 65a6371..ff8f942 100644 --- a/openstack/code/GroupDecorator.php +++ b/openstack/code/GroupDecorator.php @@ -32,10 +32,10 @@ class GroupDecorator extends DataExtension { $detailFormFields = new FieldList( new TabSet("Root", new Tab('Main', 'Main', - new HeaderField('MemberDetailsHeader',_t('Member.PERSONALDETAILS', "Personal Details", PR_MEDIUM, 'Headline for formfields')), + new HeaderField('MemberDetailsHeader', "Personal Details"), new TextField("FirstName","First Name"), new TextField("Surname","Last Name"), - new HeaderField('MemberUserDetailsHeader',_t('Member.USERDETAILS', "User Details", PR_MEDIUM, 'Headline for formfields')), + new HeaderField('MemberUserDetailsHeader',"User Details"), new ConfirmedPasswordField( 'Password', null,