openinfra
/
openstackweb
Code Issues Proposed changes

[smarcet] - #7872 

* fix on groups and companies
This commit is contained in:
Sebastian Marcet 2014-12-05 16:06:38 -03:00
parent 120213e619
commit 5b2e4c71e9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/code/Company.php
View File

@ -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

4
openstack/code/GroupDecorator.php
View File

@ -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,