diff --git a/lookup/admin.py b/lookup/admin.py new file mode 100644 index 0000000..933cfab --- /dev/null +++ b/lookup/admin.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 + +import models +from django.contrib import admin + +class MovieIdAdmin(admin.ModelAdmin): + search_fields = ['title', 'imdb_id'] +admin.site.register(models.MovieId, MovieIdAdmin) + diff --git a/lookup/models.py b/lookup/models.py index 7cdec2b..6c2bf82 100644 --- a/lookup/models.py +++ b/lookup/models.py @@ -27,8 +27,8 @@ class MovieId(models.Model): title = models.CharField(max_length=1000, blank=True, default='') year = models.CharField(max_length=4, blank=True, default='') director = models.CharField(max_length=1000, blank=True, default='') - series_title = models.TextField(blank=True, default='') - episode_title = models.TextField(blank=True, default='') + series_title = models.CharField(max_length=1000, blank=True, default='') + episode_title = models.CharField(max_length=1000, blank=True, default='') season = models.IntegerField(default=-1) episode = models.IntegerField(default=-1) @@ -39,7 +39,6 @@ class MovieId(models.Model): wikipedia_id = models.CharField(unique=True, max_length=255, blank=True, null=True, default=None) criterion_id = models.IntegerField(unique=True, blank=True, null=True, default=None) impawards_id = models.CharField(max_length=255, unique=True, blank=True, null=True, default=None) - rottentomatoes_id = models.CharField(max_length=255, unique=True, blank=True, null=True, default=None) #FIXME: look into other ids #what about tv.com ids/urls for tv episodes @@ -47,7 +46,9 @@ class MovieId(models.Model): #movieposterdb can be mapped via imdbid and does not need to be saved here def __unicode__(self): - return self.imdb_id + id = self.imdb_id + if id: id = self.id + return '%s (%s)' % (self.title, id) def updateFromWikipedia(self): if self.wikipedia_id: diff --git a/poster/admin.py b/poster/admin.py new file mode 100644 index 0000000..718c626 --- /dev/null +++ b/poster/admin.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 + +import models +from django.contrib import admin + +class PosterAdmin(admin.ModelAdmin): + search_fields = ['url', 'movie_id__title', 'movie_id__imdb_id'] +admin.site.register(models.Poster, PosterAdmin) + diff --git a/poster/models.py b/poster/models.py index 38a54bd..91aa580 100644 --- a/poster/models.py +++ b/poster/models.py @@ -14,3 +14,4 @@ class Poster(models.Model): movie_id = models.ForeignKey(MovieId, related_name='poster') url = models.CharField(max_length=255) + diff --git a/poster/views.py b/poster/views.py index 03bb9ed..169724d 100644 --- a/poster/views.py +++ b/poster/views.py @@ -10,4 +10,5 @@ from oxdata.utils.shortcuts import render_to_json_response def poster(request): #FIXME: get MovieId from provided id and redirect to poster url + return diff --git a/settings.py b/settings.py index 4f3d1b7..6b1cf00 100644 --- a/settings.py +++ b/settings.py @@ -83,6 +83,7 @@ INSTALLED_APPS = ( 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.sites', + 'django.contrib.admin', 'django.contrib.humanize', 'oxdata.criterion', 'oxdata.impawards',