tiy-durham-q3-rails / freeshelf

A network for sharing free programming books.

MIT License

3 stars 13 forks source link

added comments to books page #38

Open rscottbradshaw opened 10 years ago

rscottbradshaw commented 10 years ago

Working comments on book show page

cndreisbach commented 10 years ago

@rscottbradshaw -- checked this out. Good start! Three things:

Use the current_user as the person who is commenting. If someone isn't logged in, you might want to make a link in the comments to remind them to log in to comment.
Could you add comments to videos as well? It should be pretty much the same code.
Before pushing next time, could you merge in upstream/master. Right now, you have a conflict.

rscottbradshaw commented 10 years ago

Clinton,

I have downloaded the current copy of freestyle but none of what i had is on there. Can you tell me how to put that in there so I don’t have to do it all again?

On Jul 13, 2014, at 2:24 PM, Clinton N. Dreisbach notifications@github.com wrote:

@rscottbradshaw -- checked this out. Good start! Three things:

Use the current_user as the person who is commenting. If someone isn't logged in, you might want to make a link in the comments to remind them to log in to comment. Could you add comments to videos as well? It should be pretty much the same code. Before pushing next time, could you merge in upstream/master. Right now, you have a conflict. — Reply to this email directly or view it on GitHub.

cndreisbach commented 10 years ago

Assuming you're set up like me:

git fetch upstream
git checkout comments
git merge upstream/master

Then you get to go through merge conflicts!

rscottbradshaw commented 10 years ago

I see the merge conflict is in my Schema file but I am not sure which thing to delete to get it to work.

<<<<<<< HEAD

ActiveRecord::Schema.define(version: 20140711191251) do

ActiveRecord::Schema.define(version: 20140713190606) do

upstream/master

I wanted to ask before I completely messed something up.

Thanks for the help!!

On Jul 13, 2014, at 2:24 PM, Clinton N. Dreisbach notifications@github.com wrote:

@rscottbradshaw -- checked this out. Good start! Three things:

Use the current_user as the person who is commenting. If someone isn't logged in, you might want to make a link in the comments to remind them to log in to comment. Could you add comments to videos as well? It should be pretty much the same code. Before pushing next time, could you merge in upstream/master. Right now, you have a conflict. — Reply to this email directly or view it on GitHub.

cndreisbach commented 10 years ago

@rscottbradshaw -- good job so far! Can you make comments polymorphic so they don't have to have both a book_id and video_id?