mirror of
https://github.com/ConjureETS/site-2015.git
synced 2026-03-24 12:31:24 +00:00
25 lines
675 B
Python
25 lines
675 B
Python
from django.shortcuts import render
|
|
<<<<<<< HEAD
|
|
from blog.models import *
|
|
|
|
def index(request):
|
|
articles = Article.objects.all
|
|
return render(request, 'blog/index.html', {'articles':articles})
|
|
=======
|
|
from django.http import Http404
|
|
from blog.models import Article
|
|
|
|
|
|
def index(request):
|
|
articles = Article.objects.order_by('-created_at')
|
|
return render(request, 'blog/index.html', {'articles': articles})
|
|
|
|
|
|
def show(request, article_id):
|
|
try:
|
|
article = Article.objects.get(id=article_id)
|
|
return render(request, 'blog/show.html', {'article': article})
|
|
except Article.DoesNotExist:
|
|
raise Http404("Article does not exist")
|
|
>>>>>>> master
|