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

Ivan - Updates needed for dev3 deploy [skip ci]

This commit is contained in:
ivan 2016-12-13 21:10:49 -03:00
parent 959c9525ed
commit 8d2033ec31
9 changed files with 81 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/actions/config-actions.js
View File

@ -30,7 +30,7 @@ export default {
updateData() {
return {
type: 'UPDATE_DEPARTMENTS',
type: 'UPDATE_DATA',
payload: API.call({
path: '/system/get-settings',
data: {}

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

@ -76,7 +76,7 @@ class AddStaffModal extends React.Component {
email: form.email,
password: form.password,
level: form.level + 1,
department: JSON.stringify(departments)
departments: JSON.stringify(departments)
}
}).then(this.context.closeModal).catch((result) => {
this.setState({

8
client/src/app/admin/panel/staff/admin-panel-departments.js
View File

@ -136,7 +136,7 @@ class AdminPanelDepartments extends React.Component {
if(this.state.selectedIndex !== -1) {
API.call({
path: '/staff/edit-department',
path: '/system/edit-department',
data: {
departmentId: this.getCurrentDepartment().id,
name: form.name
@ -147,9 +147,9 @@ class AdminPanelDepartments extends React.Component {
}).catch(this.onItemChange.bind(this, -1));
} else {
API.call({
path: '/staff/add-department',
path: '/system/add-department',
data: {
name: form.title
name: form.name
}
}).then(() => {
this.retrieveDepartments();
@ -172,7 +172,7 @@ class AdminPanelDepartments extends React.Component {
deleteDepartment() {
API.call({
path: '/staff/delete-department',
path: '/system/delete-department',
data: {
departmentId: this.getCurrentDepartment().id,
transferDepartmentId: this.getDropDownItemId()

27
client/src/app/admin/panel/staff/staff-editor.js
View File

@ -73,8 +73,8 @@ class StaffEditor extends React.Component {
</Form>
<span className="separator staff-editor__separator" />
<Form className="staff-editor__update-password" onSubmit={this.onSubmit.bind(this)}>
<FormField name="password" validation="PASSWORD" required label={i18n('PASSWORD')} fieldProps={{size: 'large'}}/>
<FormField name="rpassword" validation="REPEAT_PASSWORD" required label={i18n('REPEAT_PASSWORD')} fieldProps={{size: 'large'}}/>
<FormField name="password" validation="PASSWORD" required label={i18n('PASSWORD')} fieldProps={{size: 'large', password: true}}/>
<FormField name="rpassword" validation="REPEAT_PASSWORD" required label={i18n('REPEAT_PASSWORD')} fieldProps={{size: 'large', password: true}}/>
<SubmitButton size="medium" className="staff-editor__submit-button">{i18n('UPDATE_PASSWORD')}</SubmitButton>
</Form>
{(!this.props.myAccount) ? this.renderLevelForm() : null}
@ -86,10 +86,7 @@ class StaffEditor extends React.Component {
<div className="col-md-4">
<div className="staff-editor__departments">
<div className="staff-editor__departments-title">{i18n('Departments')}</div>
<Form values={{departments: this.state.departments}} onChange={form => this.setState({departments: form.departments})} onSubmit={this.onSubmit.bind(this)}>
<FormField name="departments" field="checkbox-group" fieldProps={{items: this.getDepartments()}} />
<SubmitButton size="medium">{i18n('UPDATE_DEPARTMENTS')}</SubmitButton>
</Form>
{(!this.props.myAccount) ? this.renderDepartmentsForm() : this.renderDepartmentsInfo()}
</div>
</div>
<div className="col-md-8">
@ -118,6 +115,24 @@ class StaffEditor extends React.Component {
);
}
renderDepartmentsForm() {
return (
<Form values={{departments: this.state.departments}} onChange={form => this.setState({departments: form.departments})} onSubmit={this.onSubmit.bind(this)}>
<FormField name="departments" field="checkbox-group" fieldProps={{items: this.getDepartments()}} />
<SubmitButton size="medium">{i18n('UPDATE_DEPARTMENTS')}</SubmitButton>
</Form>
);
}
renderDepartmentsInfo() {
return (
<Form values={{departments: this.state.departments}}>
<FormField name="departments" field="checkbox-group" fieldProps={{items: this.getDepartments()}} />
</Form>
);
}
renderTickets() {
return (
<div>

30
client/src/data/fixtures/staff-fixtures.js
View File

@ -1047,35 +1047,5 @@ module.exports = [
data: {}
};
}
},
{
path: '/staff/add-department',
time: 100,
response: function () {
return {
status: 'success',
data: {}
};
}
},
{
path: '/staff/edit-department',
time: 100,
response: function () {
return {
status: 'success',
data: {}
};
}
},
{
path: '/staff/delete-department',
time: 100,
response: function () {
return {
status: 'success',
data: {}
};
}
}
];

30
client/src/data/fixtures/system-fixtures.js
View File

@ -16,5 +16,35 @@ module.exports = [
}
};
}
},
{
path: '/staff/add-department',
time: 100,
response: function () {
return {
status: 'success',
data: {}
};
}
},
{
path: '/staff/edit-department',
time: 100,
response: function () {
return {
status: 'success',
data: {}
};
}
},
{
path: '/staff/delete-department',
time: 100,
response: function () {
return {
status: 'success',
data: {}
};
}
}
];

13
server/controllers/user/get-user.php
View File

@ -7,7 +7,7 @@ class GetUserByIdController extends Controller {
public function validations() {
return [
'permission' => 'staff_2',
'permission' => 'staff_1',
'requestData' => [
'userId' => [
'validation' => DataValidator::dataStoreId('user'),
@ -20,12 +20,21 @@ class GetUserByIdController extends Controller {
public function handler() {
$userId = Controller::request('userId');
$user = User::getDataStore($userId);
$staff = Controller::getLoggedUser();
$tickets = new DataStoreList();
foreach($user->sharedTicketList as $ticket) {
if($staff->sharedDepartmentList->includesId($ticket->department->id)) {
$tickets->add($ticket);
}
}
Response::respondSuccess([
'name' => $user->name,
'email' => $user->email,
'signupDate' => $user->signupDate,
'tickets' => $user->sharedTicketList->toArray()
'tickets' => $tickets->toArray()
]);
}
}

2
server/controllers/user/get-users.php
View File

@ -6,7 +6,7 @@ class GetUsersController extends Controller {
public function validations() {
return[
'permission' => 'staff_2',
'permission' => 'staff_1',
'requestData' => [
'page' => [
'validation' => DataValidator::numeric(),

12
server/libs/DataStoreList.php
View File

@ -33,6 +33,18 @@ class DataStoreList implements IteratorAggregate {
}
}
public function includesId($id) {
$includes = false;
foreach($this->list as $item) {
if($item->id == $id) {
$includes = true;
}
}
return $includes;
}
public function toBeanList() {
$beanList = [];