Fixes issue #7 #94
Merged
Fixes issue #7 #94
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
Collaborator
armahillo
commented
May 28, 2017
armahillo
commented
- Fixes deprecation warning for AppCo methods that respond to JSON requests.
- Adds .intake! to Donations#create (inventory was not being added).
- Dashboard now actually shows totals for inventory on-hand.
- Adds massive feature spec that ensures that dashboard totals reflect intake and distribution changes.
…ests. Adds .intake! to Donations#create (inventory was not being added. Dashboard now actually shows totals for inventory on-hand. Adds massive feature spec that ensures that dashboard totals reflect intake and distribution changes.
seanmarcia
reviewed
May 29, 2017
| @@ -2,7 +2,8 @@ class DashboardController < ApplicationController | |||
| respond_to :html, :js | |||
|
|
|||
| def index | |||
| @recent_donations = Donation.includes(:line_items).recent | |||
| @recent_distributions = Distribution.includes(:line_items).recent | |||
| @recent_donations = current_organization.donations.includes(:line_items).recent | |||
There was a problem hiding this comment.
Nice fix/find! I have these changed locally! So they are scoped to the organzation!
seanmarcia
approved these changes
May 29, 2017
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.