Merge 514e160 into 46b796d

setup.py

@@ -41,6 +41,7 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=[
+        'ftw.upgrade',
         'plone.api',
         'plone.app.dexterity',
         'plone.app.layout',

src/collective/liveblog/browser/view.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from collective.liveblog.browser.base import BaseView
-from plone import api
+from datetime import datetime
+from datetime import timedelta
 from plone.memoize import ram
 from time import time
 from zope.publisher.browser import BrowserView
@@ -29,9 +30,11 @@ def has_updates(self):
     @property
     def automatic_updates_enabled(self):
         """Check if the Livelog must be updated automatically.
-        Automatic updates should be enabled in active state only.
+        Automatic updates are disabled if no updates in the last day.
         """
-        return api.content.get_state(self.context) == 'active'
+        timestamp = self.context.modified().timeTime()
+        modified = datetime.fromtimestamp(timestamp)
+        return datetime.now() - modified < timedelta(days=1)
 
     @property
     def now(self):

src/collective/liveblog/locales/es/LC_MESSAGES/plone.po

@@ -16,35 +16,3 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 "Language: Spanish\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Inactivate"
-msgstr "Desactivar"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Liveblog Workflow"
-msgstr "Flujo de trabajo para blog en vivo"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Member retracts submission"
-msgstr "El miembro retrae el blog en vivo al estado privado"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Publish and activate"
-msgstr "Publicar y activar"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Retract"
-msgstr "Retraer"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Reviewer makes the liveblog active"
-msgstr "El revisor activa el blog en vivo"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Reviewer makes the liveblog inactive"
-msgstr "El revisor inactiva el blog en vivo"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Simple workflow to be used with liveblogs. A liveblog starts on the private state and can be activated (published) to allow the addition of micro-updates. When the liveblog is no longer going to be updated, we just simply inactivate it."
-msgstr "Un flujo de trabajo sencillo para ser usado con blogs en vivo. Un blog en vivo comienza en estado privado y puede ser publicado y activado para permitir la adición de actualizaciones. Cuando el blog en vivo ya no va a ser actualizado, simplemente lo desactivamos."

src/collective/liveblog/locales/plone.pot

@@ -16,35 +16,3 @@ msgstr ""
 "Language-Name: English\n"
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: plone\n"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Inactivate"
-msgstr ""
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Liveblog Workflow"
-msgstr ""
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Member retracts submission"
-msgstr ""
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Publish and activate"
-msgstr ""
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Retract"
-msgstr ""
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Reviewer makes the liveblog active"
-msgstr ""
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Reviewer makes the liveblog inactive"
-msgstr ""
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Simple workflow to be used with liveblogs. A liveblog starts on the private state and can be activated (published) to allow the addition of micro-updates. When the liveblog is no longer going to be updated, we just simply inactivate it."
-msgstr ""

src/collective/liveblog/locales/pt_BR/LC_MESSAGES/plone.po

@@ -16,35 +16,3 @@ msgstr ""
 "Language: Brazilian Portuguese\n"
 "X-Generator: Poedit 1.5.4\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Inactivate"
-msgstr "Desativar"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Liveblog Workflow"
-msgstr "Workflow do Liveblog"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Member retracts submission"
-msgstr "O membro retrai o liveblog para o estado privado"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Publish and activate"
-msgstr "Publicar e ativar"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Retract"
-msgstr "Retrair"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Reviewer makes the liveblog active"
-msgstr "O revisor ativa o liveblog"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Reviewer makes the liveblog inactive"
-msgstr "O revisor desativa o liveblog"
-
-#: collective/liveblog/profiles/default/workflows/liveblog_workflow/definition.xml
-msgid "Simple workflow to be used with liveblogs. A liveblog starts on the private state and can be activated (published) to allow the addition of micro-updates. When the liveblog is no longer going to be updated, we just simply inactivate it."
-msgstr "Um workflow simples para ser usado con liveblogs. Um liveblog começa no estado privado e pode ser publicado y ativado para permitir a adição de atualizações. Cuando o liveblog não vai ser mais atualizado, simplesmente podemos desativá-lo."

src/collective/liveblog/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>1001</version>
+  <version>1002</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
   </dependencies>

src/collective/liveblog/tests/test_upgrades.py

@@ -31,8 +31,8 @@ def _do_upgrade(self, step):
 
 class To1001TestCase(UpgradeBaseTestCase):
 
-    from_ = '1'
-    to_ = '2'
+    from_ = '1000'
+    to_ = '1001'
 
     def test_profile_version(self):
         version = self.setup.getLastVersionForProfile(self.profile_id)[0]
@@ -41,3 +41,27 @@ def test_profile_version(self):
     def test_registered_steps(self):
         steps = len(self.setup.listUpgrades(self.profile_id)[0])
         self.assertEqual(steps, 1)
+
+
+class To1002TestCase(UpgradeBaseTestCase):
+
+    from_ = '1001'
+    to_ = '1002'
+
+    def test_profile_version(self):
+        version = self.setup.getLastVersionForProfile(self.profile_id)[0]
+        self.assertEqual(version, self.from_)
+
+    def test_registered_steps(self):
+        steps = len(self.setup.listUpgrades(self.profile_id)[0])
+        self.assertEqual(steps, 1)
+
+    def test_remove_workflow(self):
+        # address also an issue with Setup permission
+        title = u'Remove liveblog workflow'
+        step = self._get_upgrade_step_by_title(title)
+        self.assertIsNotNone(step)
+
+        # too difficult to simulate previous state programmatically
+        # so we are just going to run the upgrade step here
+        self._do_upgrade(step)