tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor style changes

This commit is contained in:
Maxi Redigonda 2019-10-29 18:23:20 -03:00
parent 93ade9cf0f
commit 643f3c81a9
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/admin/panel/staff/add-staff-modal.js
View File

@ -67,7 +67,7 @@ class AddStaffModal extends React.Component {
return SessionStore.getDepartments().map(department => { return SessionStore.getDepartments().map(department => {
if(department.private*1){ if(department.private*1){
return <spam>{department.name} <Icon name='user-secret'/> </spam> return <spam>{department.name} <Icon name='user-secret'/> </spam>
}else { } else {
return department.name; return department.name;
} }
}); });

5
server/controllers/staff/add.php
View File

@ -44,7 +44,6 @@ class AddStaffController extends Controller {
private $level; private $level;
private $departments; private $departments;
public function validations() { public function validations() {
return [ return [
'permission' => 'staff_3', 'permission' => 'staff_3',
@ -74,7 +73,7 @@ class AddStaffController extends Controller {
$this->storeRequestData(); $this->storeRequestData();
$staff = new Staff(); $staff = new Staff();
$staffRow = Staff::getDataStore($this->email,'email'); $staffRow = Staff::getDataStore($this->email, 'email');
if($staffRow->isNull()) { if($staffRow->isNull()) {
$staff->setProperties([ $staff->setProperties([
@ -84,7 +83,6 @@ class AddStaffController extends Controller {
'profilePic' => $this->profilePic, 'profilePic' => $this->profilePic,
'level' => $this->level, 'level' => $this->level,
'sharedDepartmentList' => $this->getDepartmentList() 'sharedDepartmentList' => $this->getDepartmentList()
]); ]);
$this->addOwner(); $this->addOwner();
@ -120,6 +118,7 @@ class AddStaffController extends Controller {
return $listDepartments; return $listDepartments;
} }
public function addOwner() { public function addOwner() {
$departmentIds = json_decode($this->departments); $departmentIds = json_decode($this->departments);

6
server/controllers/user/send-recover-password.php
View File

@ -57,9 +57,9 @@ class SendRecoverPasswordController extends Controller {
$email = Controller::request('email'); $email = Controller::request('email');
if($this->staff){ if($this->staff){
$this->user = Staff::getUser($email,'email'); $this->user = Staff::getUser($email, 'email');
}else { } else {
$this->user = User::getUser($email,'email'); $this->user = User::getUser($email, 'email');
} }
if(!$this->user->isNull()) { if(!$this->user->isNull()) {