diff options
Diffstat (limited to 'python/tbc_www')
| -rw-r--r-- | python/tbc_www/models.py | 2 | ||||
| -rw-r--r-- | python/tbc_www/router.py | 4 | ||||
| -rw-r--r-- | python/tbc_www/urls.py | 25 |
3 files changed, 16 insertions, 15 deletions
diff --git a/python/tbc_www/models.py b/python/tbc_www/models.py index 0d58bc1..a0a25f3 100644 --- a/python/tbc_www/models.py +++ b/python/tbc_www/models.py @@ -74,7 +74,7 @@ class EbuildsMetadata(models.Model): class Meta: db_table = 'ebuilds_metadata' def __str__(self): - return '%s %s %s %s %s' % (self.Id, self.EbuildId, self,Commit, self.New, self.Descriptions) + return '%s %s %s %s %s' % (self.Id, self.EbuildId, self.Commit, self.New, self.Descriptions) class BuildLogs(models.Model): BuildLogId = models.IntegerField(primary_key=True, db_column='build_log_id') diff --git a/python/tbc_www/router.py b/python/tbc_www/router.py index 7a512fd..bac2a30 100644 --- a/python/tbc_www/router.py +++ b/python/tbc_www/router.py @@ -23,8 +23,8 @@ class TBCRouter(object): return True return False - def allow_migrate(self, db, model): - if db == 'tbc' or model._meta.app_label == "tbc_www": + def allow_migrate(self, db, app_label, model_name=None, **hints): + if db == 'tbc' or app_label == "tbc_www": return False # we're not using syncdb on our legacy database else: # but all other models/databases are fine return True diff --git a/python/tbc_www/urls.py b/python/tbc_www/urls.py index 5be267f..ea2db31 100644 --- a/python/tbc_www/urls.py +++ b/python/tbc_www/urls.py @@ -1,13 +1,14 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import url +from . import views -urlpatterns = patterns('tbc_www.views', - url(r'^home/$', 'home'), - url(r'^packages/$', 'categories'), - url(r'^categories/(?P<category_id>\d+)/$', 'packages'), - url(r'^packages/(?P<package_id>\d+)/$', 'ebuilds'), - url(r'^ebuild/(?P<ebuild_id>\d+)/$', 'ebuild'), - url(r'^new/logs/build/(?P<buildlog_id>\d+)/$', 'new_logs_build'), - url(r'^new/logs/$', 'new_logs'), - url(r'^new/repoman/$', 'new_repoman'), - url(r'^new/$', 'new_main'), -) +urlpatterns = [ + url(r'^home/$', views.home), + url(r'^packages/$', views.categories), + url(r'^categories/(?P<category_id>\d+)/$', views.packages), + url(r'^packages/(?P<package_id>\d+)/$', views.ebuilds), + url(r'^ebuild/(?P<ebuild_id>\d+)/$', views.ebuild), + url(r'^new/logs/build/(?P<buildlog_id>\d+)/$', views.new_logs_build), + url(r'^new/logs/$', views.new_logs), + url(r'^new/repoman/$', views.new_repoman), + url(r'^new/$', views.new_main), +] |