diff --git a/.gitignore b/.gitignore index 6858258..bb5d431 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ settings.py dev.db static/gaute/.sass-cache -uploads +uploads/[^.]* diff --git a/main/admin.py b/main/admin.py index 5733701..d9d68ba 100644 --- a/main/admin.py +++ b/main/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from bbs.main.models import * +from main.models import * class ProductAdmin(admin.ModelAdmin): pass diff --git a/main/urls.py b/main/urls.py index b508f71..c750a8d 100644 --- a/main/urls.py +++ b/main/urls.py @@ -1,5 +1,5 @@ from django.conf.urls.defaults import patterns, include, url -urlpatterns = patterns('bbs.main.views', +urlpatterns = patterns('main.views', url(r'^register/$', 'register', name='register'), ) diff --git a/main/views.py b/main/views.py index 2439b32..d1b209a 100755 --- a/main/views.py +++ b/main/views.py @@ -21,7 +21,7 @@ def home(request): else: if request.user.is_authenticated(): # Redirect to the register - return HttpResponseRedirect( reverse('bbs.main.views.register') ) + return HttpResponseRedirect( reverse('main.views.register') ) else: form = AuthenticationForm(request) return render_to_response('home.html', locals(), context_instance=RequestContext(request)) @@ -33,7 +33,7 @@ def register(request): form = OrderLineForm(data=request.POST) if form.is_valid(): form.save() - return HttpResponseRedirect( reverse('bbs.main.views.register') ) + return HttpResponseRedirect( reverse('main.views.register') ) products = Product.objects.all() users = User.objects.all() # Formset for orderlines diff --git a/urls.py b/urls.py index 41abe61..2cf87e6 100755 --- a/urls.py +++ b/urls.py @@ -14,5 +14,5 @@ urlpatterns = patterns('', ) -from django.contrib.staticfiles.urls import staticfiles_urlpatterns # for dev -urlpatterns += staticfiles_urlpatterns() +#from django.contrib.staticfiles.urls import staticfiles_urlpatterns # for dev +#urlpatterns += staticfiles_urlpatterns()