From 149eb611703ad916346992318d49371d20e49725 Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <arnau@debian.org>
Date: Fri, 6 Feb 2009 21:57:28 +0000
Subject: [PATCH] Don't try to mass generate the movie if disabled in the configuration

---
 kid/generate_confirm_form.kid |    2 +-
 kid/generate_form.kid         |    6 ++++--
 lib/core.py                   |    2 +-
 lib/massgeneration.py         |    5 +++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/kid/generate_confirm_form.kid b/kid/generate_confirm_form.kid
index fd1f6d7..d7fac47 100644
--- a/kid/generate_confirm_form.kid
+++ b/kid/generate_confirm_form.kid
@@ -26,7 +26,7 @@
               <td py:content="stats['photos']['existing']" />
               <td py:content="stats['photos']['generate']" />
             </tr>
-            <tr>
+            <tr py:if="stats.has_key('movies')">
               <th py:content="trn('label_cat_movies')" />
               <td py:content="stats['movies']['nbobjects']" />
               <td py:content="stats['movies']['total']" />
diff --git a/kid/generate_form.kid b/kid/generate_form.kid
index 9d7f82a..9d814df 100644
--- a/kid/generate_form.kid
+++ b/kid/generate_form.kid
@@ -42,14 +42,16 @@
         </div>
       </fieldset>
 
-      <fieldset>
+      <?python movie_qualities = context.get_movie_qualities() ?>
+	
+      <fieldset py:if="movie_qualities">
         <legend py:content="trn('label_generate_movies')" />
 
         <div class="field">
           <label py:content="trn('label_generate_movies_qualities')" />
           <div class="help" py:content="trn('help_generate_movies_qualities')" />
           <select name="qualities" multiple="multiple">
-            <option py:for="quality in context.get_movie_qualities()"
+            <option py:for="quality in movie_qualities"
                     value="${quality}"
                     py:content="trn('label_movie_' + quality)" />
           </select>
diff --git a/lib/core.py b/lib/core.py
index 3ceedf9..d41de6d 100644
--- a/lib/core.py
+++ b/lib/core.py
@@ -462,7 +462,7 @@ class PyotoCore(security.SecurityAware, admin.AdminSupport):
         """
         qualities = self.config.get("moviequalities", None)
         if not qualities:
-            return res
+            return []
 
         qualities = utils.uniquize(qualities.split(), strip = True)
 
diff --git a/lib/massgeneration.py b/lib/massgeneration.py
index dd18baa..81299d4 100644
--- a/lib/massgeneration.py
+++ b/lib/massgeneration.py
@@ -29,8 +29,6 @@ class MassGenerator(object):
     """
     This is an adapter for mass generation
     """
-    categories = [ "photos", "movies",  ]
-    
     def __init__(self, context, values):
         """
         Constructor
@@ -49,6 +47,9 @@ class MassGenerator(object):
         self.values["qualities"] = values.get("qualities", [])
         if not isinstance(self.values["qualities"], list):
             self.values["qualities"] = [ self.values["qualities"] ]
+
+        self.categories = context.get_movie_qualities() and \
+            [ "photos", "movies",  ] or [ "photos", ]
         
     def get_stats(self):
         """
-- 
1.6.0.6