Super user feature #841
Merged
Super user feature #841
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…into super-user-feature
ivandiazwm
reviewed
Jul 18, 2020
| $authorsMatch = RedBean::getAll($authorsQuery, [':query' => "%" .$query . "%",':queryAtBeginning' => $query . "%"] ); | ||
| $authors = []; | ||
| if(!$searchUser){ | ||
| $sqlQuery = "SELECT id,name,level FROM staff " . $this->generateAuthorsIdQuery($query) . " LIMIT 10"; |
There was a problem hiding this comment.
move SELECT inside the funcltion, also you only need id,level
ivandiazwm
reviewed
Jul 19, 2020
server/controllers/ticket/search.php
Outdated
| @@ -102,7 +104,8 @@ public function validations() { | |||
| } | |||
|
|
|||
| public function handler() { | |||
|
|
|||
| $this->supervisor = Controller::request('supervisor') ? Controller::request('supervisor') : 0; | |||
There was a problem hiding this comment.
$this->ignoreDeparmentFilter = (bool)Controller::request('supervisor')
ivandiazwm
reviewed
Jul 19, 2020
| $superUser = User::getDataStore(Controller::request('userId')); | ||
|
|
||
| foreach ($clearedList as $item) { | ||
| if($item == $superUser->id) throw new Exception(ERRORS::SUPERVISOR_CAN_NOT_SELECT_HIMSELF); |
There was a problem hiding this comment.
SUPERVISOR_CAN_NOT_SUPERVISE_HIMSELF
ivandiazwm
reviewed
Jul 19, 2020
| public function handler() { | ||
| $userIdList = $this->getUserIdListCleared(); | ||
| $superUser = User::getDataStore(Controller::request('userId')); | ||
| $supervisedRelation = SupervisedRelation::getDataStore($superUser->supervisedrelation_id); |
There was a problem hiding this comment.
if(!$superUser->supervisedrelation) {
$superUser->supervisedrelation = new SupervisedRelation();
}
$superUser->supervisedrelation->sharedUserList->clear();
foreach ($userIdList as $userId) {
$user = User::getDataStore($userId);
$superUser->supervisedrelation->sharedUserList->add($user);
}
$superUser->supervisedrelation->store();
$superUser->store();
// Datastorelist
public function clear() {
foreach($index => $item as $this->list) {
unset($this->list[$index]);
}
}
ivandiazwm
reviewed
Jul 20, 2020
|
|
||
| public function handler() { | ||
| $this->page = Controller::request('page') ? Controller::request('page') : 1; | ||
| $this->showOwnTickets = Controller::request('showOwnTickets') ? true : false; |
There was a problem hiding this comment.
(bool)Controller::request('showOwnTickets')
ivandiazwm
reviewed
Jul 20, 2020
| * @apiPermission user | ||
| * | ||
| * @apiParam {id[]} supervisedUsers arrays of users Ids. | ||
| * @apiParam {boolean} showOwnTickets boolean to show or not own tickets. |
There was a problem hiding this comment.
showOwnTickets boolean to show or not current logged user tickets
ivandiazwm
reviewed
Jul 21, 2020
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <div className="dashboard-ticket-list"> | ||
| <Header title={i18n('TICKET_LIST')} description={i18n('TICKET_LIST_DESCRIPTION')} /> | ||
| <TicketList tickets={this.props.tickets} type="primary"/> | ||
| {this.props.userUsers ? this.showSupervisorOptions() : null} |
There was a problem hiding this comment.
maybe it should be this.props.userUsers.length
ivandiazwm
reviewed
Jul 21, 2020
| }); | ||
| } | ||
|
|
||
| updateTicketList(object = {}){ |
There was a problem hiding this comment.
updateTicketList({users, page, ownTickets}) {
ivandiazwm
approved these changes
Jul 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.