CAMP/chaloBEST
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
ChaloBEST server 2012-01-11 14:56:23 +01:00
parent b00a1945bf
commit ebf882c454
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
chaloBEST/chalobest.db
View File

Binary file not shown.

2
chaloBEST/mumbai/models.py
View File

@ -49,7 +49,7 @@ class Area(models.Model):
class Road(models.Model): class Road(models.Model):
roadcd = models.IntegerField(primary_key=True) roadcd = models.IntegerField(primary_key=True)
roadnm = models.TextField(blank=True, max_length=255) roadnm = models.TextField(blank=True, max_length=255)
roadnm_mr= models.TextField(blank=True, max_length=512) #roadnm_mr= models.TextField(blank=True, max_length=512)
def __unicode__(self): def __unicode__(self):
return self.roadnm return self.roadnm

1
chaloBEST/urls.py
View File

@ -9,6 +9,7 @@ urlpatterns = patterns('',
# Example: # Example:
# (r'^chaloBEST/', include('chaloBEST.foo.urls')), # (r'^chaloBEST/', include('chaloBEST.foo.urls')),
url(r'^$','chaloBEST.views.index', name='index'), url(r'^$','chaloBEST.views.index', name='index'),
url(r'^static/(?P<path>.*)$','django.views.static.serve', {'document_root':'./static'}),
# Uncomment the admin/doc line below to enable admin documentation: # Uncomment the admin/doc line below to enable admin documentation:
(r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/doc/', include('django.contrib.admindocs.urls')),