Sort users by name on time tracking page dropdown #1885
Merged
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
vipulnsward
requested review from
keshavbiswa
and removed request for
akhilgkrishnan
keshavbiswa
reviewed
Jul 29, 2024
|
@keshavbiswa Please review |
keshavbiswa
reviewed
Aug 27, 2024
| end | ||
|
|
||
| def is_admin? | ||
| current_user.has_role?(:owner, current_company) || current_user.has_role?(:admin, current_company) |
There was a problem hiding this comment.
Can you check if it's possible to add both together, in one check?
Comment on lines
57
to
59
| def set_is_admin | ||
| @is_admin = current_user.has_role?(:owner, current_company) || current_user.has_role?(:admin, current_company) | ||
| @is_admin = is_admin? | ||
| end |
There was a problem hiding this comment.
Can you try removing this?
Comment on lines
57
to
59
| def set_is_admin | ||
| @is_admin = current_user.has_role?(:owner, current_company) || current_user.has_role?(:admin, current_company) | ||
| @is_admin = is_admin? | ||
| end |
There was a problem hiding this comment.
Can you try removing this?
| @@ -0,0 +1,19 @@ | |||
| # frozen_string_literal: true | |||
|
|
|||
| module EmployeeFetcher | |||
There was a problem hiding this comment.
Suggested change
| module EmployeeFetcher | |
| module EmployeeMethods |
keshavbiswa
reviewed
Aug 27, 2024
|
|
||
| included do | ||
| def set_employees | ||
| @employees = admin? ? current_company_users : [current_user] |
There was a problem hiding this comment.
There is an inconsistency of data being sent here.
If admin is true:, we're sending only :id, :first_name, :last_name, but if it's false then we're sending current_user to the array.
Can you check if it's possible to just send id, first_name, last_name or just send the whole object?
keshavbiswa
approved these changes
Aug 29, 2024
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.
Fixes #1884