Skip to content
Open

T3 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
4744c85
ticket1_not_full
CrooZER Oct 24, 2014
b5274b1
ticket:1 adding bootstrap etc
CrooZER Oct 24, 2014
d36e985
ticket:1
CrooZER Oct 27, 2014
9a85890
ticket:1
CrooZER Oct 27, 2014
b076325
ticket:1 added south
CrooZER Oct 27, 2014
0862887
ticket:1 added south
CrooZER Oct 27, 2014
3ff8a7d
ticket:1 removed south
CrooZER Oct 27, 2014
2816590
ticket:1 decomment test
CrooZER Oct 27, 2014
9394796
ticket:1 comment test
CrooZER Oct 27, 2014
51e5237
ticket:2 add middleware base
CrooZER Oct 27, 2014
ad0ec5a
ticket:2 middleware
CrooZER Oct 27, 2014
7967bdd
ticket:2 middleware issue
CrooZER Oct 28, 2014
c669657
ticket:2 middleware issue#2
CrooZER Oct 28, 2014
af214fd
ticket:2 middleware issue#3
CrooZER Oct 28, 2014
e9a8ff7
ticket:2 middleware issue#3
CrooZER Oct 28, 2014
a9d1441
ticket:2 middleware issue#4
CrooZER Oct 28, 2014
9005419
ticket:2 middleware schemamigration
CrooZER Oct 28, 2014
65009fa
ticket:2 middleware schemamigration test
CrooZER Oct 28, 2014
be38aa1
ticket:2 middleware schemamigration
CrooZER Oct 28, 2014
3b8f576
ticket:2 middleware schemamigration test passed
CrooZER Oct 28, 2014
ee81adc
ticket:2 middleware schemamigration test passed
CrooZER Oct 28, 2014
5951364
ticket:2 middleware schemamigration test passed#2
CrooZER Oct 28, 2014
ab55613
ticket:2 middleware schemamigration test passed#2
CrooZER Oct 28, 2014
75fb74f
ticket:2 middleware migrate auto#2
CrooZER Oct 28, 2014
e011bea
ticket:2 db issue
CrooZER Oct 28, 2014
ab7e98e
ticket:2 db issue
CrooZER Oct 28, 2014
3c8476d
ticket:3 db issue
CrooZER Oct 28, 2014
de79013
ticket:3 db issue#1
CrooZER Oct 28, 2014
a46bdc9
ticket:3 db issue#2
CrooZER Oct 28, 2014
100fe3c
ticket:3 db issue#3
CrooZER Oct 28, 2014
c84237c
ticket:3 db issue#4
CrooZER Oct 28, 2014
fc7b7cf
ticket:3 db issue#5
CrooZER Oct 28, 2014
643f002
ticket:3 db issue#6
CrooZER Oct 28, 2014
23d9bb2
ticket:3 db issue#6
CrooZER Oct 28, 2014
01af5ad
ticket:3 db issue#7
CrooZER Oct 28, 2014
cf68be2
ticket:3 db issue#8
CrooZER Oct 28, 2014
1bd3a2a
ticket:3 db issue#9
CrooZER Oct 28, 2014
dd93aae
ticket:3 db issue#10
CrooZER Oct 31, 2014
cab9f4b
ticket:3 #11 tabs issue
CrooZER Oct 31, 2014
547d0de
ticket:3 #12 tabs issue
CrooZER Oct 31, 2014
f8baa3d
ticket:3 #13 tabs issue
CrooZER Oct 31, 2014
900f9bb
ticket:3 #14 tabs issue
CrooZER Oct 31, 2014
aebbef8
ticket:3 #15 tabs issue
CrooZER Oct 31, 2014
32056fd
ticket:3 #16 db issue
CrooZER Oct 31, 2014
c09a1ef
ticket:3 #17 db issue
CrooZER Oct 31, 2014
8543ca5
ticket:3 #18 db issue
CrooZER Oct 31, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ run:
syncdb:
PYTHONPATH=`pwd` DJANGO_SETTINGS_MODULE=$(SETTINGS) $(MANAGE) syncdb --noinput

schemamigrate:
PYTHONPATH=`pwd` DJANGO_SETTINGS_MODULE=$(SETTINGS) $(MANAGE) schemamigration hello --initial

migrate:
PYTHONPATH=`pwd` DJANGO_SETTINGS_MODULE=$(SETTINGS) $(MANAGE) migrate
PYTHONPATH=`pwd` DJANGO_SETTINGS_MODULE=$(SETTINGS) $(MANAGE) migrate hello

collectstatic:
PYTHONPATH=`pwd` DJANGO_SETTINGS_MODULE=$(SETTINGS) $(MANAGE) collectstatic --noinput
.PHONY: test syncdb migrate
.PHONY: test syncdb schemamigrate migrate
8 changes: 7 additions & 1 deletion apps/hello/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
from django.contrib import admin

from hello.models import Request
from django.db import models
# Register your models here.

class RequestAdmin(admin.ModelAdmin):
list_display = ['method', 'path', 'user', 'created_at', 'updated_at']

admin.site.register(Request, RequestAdmin)
40 changes: 40 additions & 0 deletions apps/hello/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models


class Migration(SchemaMigration):

def forwards(self, orm):
# Adding model 'Request'
db.create_table(u'hello_request', (
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('method', self.gf('django.db.models.fields.CharField')(max_length=10)),
('path', self.gf('django.db.models.fields.TextField')()),
('user', self.gf('django.db.models.fields.TextField')()),
('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
))
db.send_create_signal(u'hello', ['Request'])


def backwards(self, orm):
# Deleting model 'Request'
db.delete_table(u'hello_request')


models = {
u'hello.request': {
'Meta': {'object_name': 'Request'},
'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
'path': ('django.db.models.fields.TextField', [], {}),
'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'user': ('django.db.models.fields.TextField', [], {})
}
}

complete_apps = ['hello']
Empty file.
10 changes: 10 additions & 0 deletions apps/hello/models.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
from django.db import models

# Create your models here.

class Request(models.Model):
method = models.CharField(max_length=10)
path = models.TextField()
user = models.TextField()
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)

def __unicode__(self):
return self.path
5 changes: 3 additions & 2 deletions apps/hello/tests.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django.test import TestCase

# Create your tests here.
#Create your tests here.
class SomeTests(TestCase):
def test_math(self):
assert(2+2==5)
# assert(2+2==4)
pass
20 changes: 19 additions & 1 deletion apps/hello/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
from django.shortcuts import render

from hello.models import Request
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
# Create your views here.

def home(request):
return render(request, 'index.html')

def requests(request):
requests = Request.objects.all()
paginator = Paginator(requests, 25) # Show 25 contacts per page
page = request.GET.get('page')
try:
contacts = paginator.page(page)
except PageNotAnInteger:
# If page is not an integer, deliver first page.
contacts = paginator.page(1)
except EmptyPage:
# If page is out of range (e.g. 9999), deliver last page of results.
contacts = paginator.page(paginator.num_pages)
return render(request, 'requests.html', locals())
Loading