makerbistro

[bangner]

Ingredients are not properly printing out on the index page

[a17levine]

would you like to go over this?

On Mon, Oct 14, 2013 at 1:26 AM, Joe Wagner notifications@github.comwrote:

Ingredients are not properly printing out on the index page

You can merge this Pull Request by running

git pull https://github.com/bangner/makerbistro-1 start-branch

Or view, comment on, or merge it at:

#5
Commit Summary

• ready for students to use
• first commit
• add price to menu_items
• generated models for recipe and ingredient
• add root route and resources
• change index and show page
• add examples into seed file
• fix form to include ingredients when editing
• cant get ingredients to print our properly on the index page

File Changes

• M Gemfilehttps://github.com/makerbistro #5/files#diff-0(4)
• M Gemfile.lockhttps://github.com/makerbistro #5/files#diff-1(5)
• M app/controllers/ingredients_controller.rbhttps://github.com/makerbistro #5/files#diff-2(35)
• M app/controllers/menu_items_controller.rbhttps://github.com/makerbistro #5/files#diff-3(2)
• M app/models/ingredient.rbhttps://github.com/makerbistro #5/files#diff-4(4)
• M app/models/menu_item.rbhttps://github.com/makerbistro #5/files#diff-5(8)
• M app/models/recipe.rbhttps://github.com/makerbistro #5/files#diff-6(4)
• M app/views/menu_items/_form.html.erbhttps://github.com/makerbistro #5/files#diff-7(9)
• A app/views/menu_items/_ingredient.form.html.erbhttps://github.com/makerbistro #5/files#diff-8(18)
• M app/views/menu_items/index.html.erbhttps://github.com/makerbistro #5/files#diff-9(13)
• M app/views/menu_items/show.html.erbhttps://github.com/makerbistro #5/files#diff-10(7)
• M config/routes.rbhttps://github.com/makerbistro #5/files#diff-11(57)
• M db/migrate/20131010155724_create_menu_items.rbhttps://github.com/makerbistro #5/files#diff-12(2)
• A db/migrate/20131014041455_add_price_to_menu_items.rbhttps://github.com/makerbistro #5/files#diff-13(5)
• R db/migrate/20131014042052_create_recipes.rbhttps://github.com/makerbistro #5/files#diff-14(5)
• R db/migrate/20131014042123_create_ingredients.rbhttps://github.com/makerbistro #5/files#diff-15(2)
• M db/schema.rbhttps://github.com/makerbistro #5/files#diff-16(7)
• M db/seeds.rbhttps://github.com/makerbistro #5/files#diff-17(25)
• D test/controllers/.keephttps://github.com/makerbistro #5/files#diff-18(0)
• D test/controllers/menu_items_controller_test.rbhttps://github.com/makerbistro #5/files#diff-19(49)
• D test/fixtures/.keephttps://github.com/makerbistro #5/files#diff-20(0)
• M test/fixtures/ingredients.ymlhttps://github.com/makerbistro #5/files#diff-21(14)
• D test/fixtures/menu_items.ymlhttps://github.com/makerbistro #5/files#diff-22(9)
• D test/helpers/.keephttps://github.com/makerbistro #5/files#diff-23(0)
• D test/helpers/menu_items_helper_test.rbhttps://github.com/makerbistro #5/files#diff-24(4)
• D test/integration/.keephttps://github.com/makerbistro #5/files#diff-25(0)
• D test/mailers/.keephttps://github.com/makerbistro #5/files#diff-26(0)
• D test/models/.keephttps://github.com/makerbistro #5/files#diff-27(0)
• D test/models/menu_item_test.rbhttps://github.com/makerbistro #5/files#diff-28(7)
• D test/test_helper.rbhttps://github.com/makerbistro #5/files#diff-29(15)

Patch Links:

• https://github.com/makersquare/makerbistro/pull/5.patch
• https://github.com/makersquare/makerbistro/pull/5.diff

Alex Levine
Fellow

MAKERSQUARE http://themakersquare.com/
*
978.273.1004 | @alevee https://twitter.com/alevee
*