From c719dcba2d37f1814aa2bae55947d77453f70b9c Mon Sep 17 00:00:00 2001 From: bnewbold Date: Wed, 21 Feb 2007 21:58:59 -0800 Subject: fixed some xhtml nitty gritty, progress on git_wiki --- bn_django/git_wiki/views.py | 46 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'bn_django/git_wiki/views.py') diff --git a/bn_django/git_wiki/views.py b/bn_django/git_wiki/views.py index d9ce15f..1212f44 100644 --- a/bn_django/git_wiki/views.py +++ b/bn_django/git_wiki/views.py @@ -1,4 +1,3 @@ -import settings from django import forms, http, template from django.contrib.auth.decorators import login_required from django.shortcuts import get_object_or_404, render_to_response @@ -7,37 +6,34 @@ from django.http import HttpResponse import os, commands from models import * - -try: - GITWIKI_BASE = settings.GITWIKI_BASE+'/' -except AttributeError: - GITWIKI_BASE='/home/' - -try: - GITCOMMAND = settings.GITCOMMAND -except AttributeError: - GITCOMMAND='git' - +from settings import * # Create your views here. def frontpage(request): - + t = fromslug('/') + t.update() return render_to_response('git_wiki/frontpage.html', \ - dict()) - -def item(request, req=''): - #GITPREFIX = models.getGITPREFIX() - #i = Item() - #i.update() - - return render_to_response('git_browse/item.html', + dict(shortlog=shortlog(), tree=t)) + +def tree(request, reqslug): + t = fromslug(reqslug) + if t.type == 'blob': + return item(request, reqslug) + t.update() + return render_to_response('git_wiki/tree.html', + dict(shortlog=shortlog(tree=t), tree=t)) + +def item(request, reqslug): + i = fromslug(reqslug) + if i.type == 'tree': + return tree(request, reqslug) + i.update() + return render_to_response('git_wiki/item.html', dict(item=i)) def olditem(request, hash): - #GITPREFIX = models.getGITPREFIX() - #i = Item() - #i.update() - + i = get_object_or_404(Item, id=hash) + i.update() return render_to_response('git_browse/olditem.html', dict(item=i)) -- cgit v1.2.3