search

pclubuiet / website

Programming club, PU official website.
https://pclubuiet.herokuapp.com
GNU General Public License v3.0
14 stars 70 forks source link

Resource models with a foreign key #118

Closed AndrewTelleria closed 7 years ago

AndrewTelleria commented 7 years ago

Fixes issue #115

Changes: Add two models to the models file in the home app. The first model is a Resource class that has a language field and the second model is a Resources class that pools the Resource class.

divyam3897 commented 7 years ago

@AndrewTelleria still on it?

AndrewTelleria commented 7 years ago

I am still on it. I had to work this weekend and didn't have time.

AndrewTelleria commented 7 years ago

I have changed the name of the Resources model to ResourcesPool and I removed the pub_date and example. I do not know what else you want to represent with these models.

AndrewTelleria commented 7 years ago

As far as squashing the commits I am having trouble. I can't seem to squash the merge commits - they will not show up on the git log or on when I type in rebase.

Update: I figured it out.

AndrewTelleria commented 7 years ago

There was a merge conflict that I had to resolve in the README before I could push. I copied and pasted the README from the current master branch into my branch's README hoping that wouldn't have caused any conflict. My branch's README should be identical to the master's README.