Viewing: trunk/collection/views.py

Revision: 56

View as text-only | View History
Index: views.py
===================================================================
--- views.py	(revision 56)
+++ views.py	(revision 61)
@@ -94,12 +94,10 @@
     form_class = MovieForm
     def form_valid(self, form):
         self.object = form.save()
-        #for watchlist in self.object.genre.watchlist_set.all():
-        #    body = get_template("collection/notifications/new_movie.txt").render(Context({'user':watchlist.owner, 'movie':self.object}))
-        #    watchlist.owner.email_user('Nick added a new %s movie' % self.object.genre, body)
-        movie_url = 'http://www.cinema-nick.com%s' % self.object.get_absolute_url()
-        urls = urllib.urlencode({'href':movie_url, 'redirect_uri':movie_url})
-        return HttpResponseRedirect('https://www.facebook.com/dialog/share?app_id=%s&display=page&%s' % (settings.FACEBOOK_APP_ID, urls))
+        for watchlist in self.object.genre.watchlist_set.all():
+            body = get_template("collection/notifications/new_movie.txt").render(Context({'user':watchlist.owner, 'movie':self.object}))
+            watchlist.owner.email_user('Nick added a new %s movie' % self.object.genre, body)
+        return redirect(self.object)
 
 class MovieDetail(DetailView):
     model = Movie
@@ -123,9 +121,9 @@
             movie_title=movie_title.replace('Part 2', 'Part II').replace('Part 3', 'Part III').replace(', A', '')
             try:
                 if self.object.year:
-                    omdb = urllib.urlopen('http://www.omdbapi.com/?t=%s&y=%s' % (movie_title, self.object.year)).read()
+                    omdb = urllib.urlopen('http://www.omdbapi.com/?t=%s&y=%s&apikey=%s' % (movie_title, self.object.year, settings.OMDB_APIKEY)).read()
                 else:
-                    omdb = urllib.urlopen('http://www.omdbapi.com/?t=%s' % movie_title).read()
+                    omdb = urllib.urlopen('http://www.omdbapi.com/?t=%s&apikey=%s' % (movie_title, settings.OMDB_APIKEY)).read()
             except:
                 omdb = '{"Response":"False"}'
                 value = sys.exc_info()[1]
@@ -225,7 +223,7 @@
         messages.error(req, "You do not have access to update the info from IMDb.")
         return redirect(movie)
     try:
-        omdb = urllib.urlopen('http://www.omdbapi.com/?i=%s' % movie.imdb).read()
+        omdb = urllib.urlopen('http://www.omdbapi.com/?i=%s&apikey=%s' % (movie.imdb, settings.OMDB_APIKEY)).read()
     except:
         omdb = '{"Response":"False"}'
         value = sys.exc_info()[1]