[MNOE-978] Refactor pagination #673
Open
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
iseessel
changed the title
adamaziz15
approved these changes
Mar 26, 2018
adamaziz15
requested changes
Mar 27, 2018
| @@ -1,2 +1,2 @@ | |||
| json.extract! organization, :id, :name, :uid, :soa_enabled, :created_at, :account_frozen, :financial_metrics, :billing_currency, :external_id, :belong_to_sub_tenant, :belong_to_account_manager, :demo_account | |||
|
|
|||
| json.role @user.role(organization) if @user | |||
There was a problem hiding this comment.
Since @user is being passed into the partial in the view (...admin/organizations/show.json.jbuilder), can it be referred to as just user here or can the user: @user be removed from the show view?
| @@ -26,6 +26,10 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::Admin::OrganizationsContro | |||
| #================================================================== | |||
| # GET /mnoe/jpi/v1/admin/organizations | |||
| def index | |||
| # When fetching multiple organizations attached to one user, we must fetch the user's role for each organization. | |||
| where = params["where"] | |||
| @user = MnoEnterprise::User.find_one(params["where"]["users.id"], :orga_relations) if where && where["users.id"] | |||
There was a problem hiding this comment.
Can we refactor this like this maybe?
@user = MnoEnterprise::User.find_one(params["where"]["users.id"], :orga_relations) if params.dig('where', 'users.id')
Then the assignment on line 30 can be removed.
iseessel
force-pushed
the
feature/921-refactor-pagination
branch
4 times, most recently
from
ffda3dc to
bc501ad
Compare
ouranos
previously approved these changes
Apr 16, 2018
iseessel
force-pushed
the
feature/921-refactor-pagination
branch
from
bc501ad to
16aadca
Compare
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.