another fix for beta

[redakcja.git] / apps / catalogue / tasks.py

diff --git a/apps/catalogue/tasks.py b/apps/catalogue/tasks.py
index c84a291..9507c41 100644 (file)
--- a/apps/catalogue/tasks.py
+++ b/apps/catalogue/tasks.py
@@ -1,39 +1,25 @@
+# -*- coding: utf-8 -*-

 from celery.task import task
 from django.utils import translation
 from celery.task import task
 from django.utils import translation

-from django.conf import settings

 
 
 @task(ignore_result=True)
 def _refresh_by_pk(cls, pk, language=None):
     prev_language = translation.get_language()
 
 
 @task(ignore_result=True)
 def _refresh_by_pk(cls, pk, language=None):
     prev_language = translation.get_language()

-    language and translation.activate(language)
+    if language:
+        translation.activate(language)

     try:
         cls._default_manager.get(pk=pk).refresh()
     try:
         cls._default_manager.get(pk=pk).refresh()

+    except cls.DoesNotExist:
+        pass

     finally:
         translation.activate(prev_language)
 
     finally:
         translation.activate(prev_language)
 

+

 def refresh_instance(instance):
     _refresh_by_pk.delay(type(instance), instance.pk, translation.get_language())
 
 
 def refresh_instance(instance):
     _refresh_by_pk.delay(type(instance), instance.pk, translation.get_language())
 
 

-@task
-def _publishable_error(book, language=None):
-    prev_language = translation.get_language()
-    language and translation.activate(language)
-    try:
-        return book.assert_publishable()
-    except AssertionError, e:
-        return e
-    else:
-       return None
-    finally:
-        translation.activate(prev_language)
-
-def publishable_error(book):
-    return _publishable_error.delay(book, 
-        translation.get_language()).wait()
-
-

 @task(ignore_result=True)
 def book_content_updated(book):
     book.refresh_dc_cache()
 @task(ignore_result=True)
 def book_content_updated(book):
     book.refresh_dc_cache()