From 3e576d64cf39e12e56e1121695c085d143f8aca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 15 Jul 2010 16:20:09 +0200
Subject: [PATCH] Moved generate odt action code to avis classes

---
 Avis.py        |  7 -------
 AvisLegis.py   |  7 ++++++-
 AvisSimplif.py | 10 ++++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Avis.py b/Avis.py
index 9cd2201..51972c3 100644
--- a/Avis.py
+++ b/Avis.py
@@ -33,13 +33,6 @@ from config import *
 class AvisOdt:
     '''Base class for common methods of Avis'''
 
-    def canSetDefaultPage(self):
-        return False
-
-    def generateOdt(self, RESPONSE):
-        '''Generates the ODT version of this advice.'''
-        return self._generate(RESPONSE, 'odt')
-
     def _generate(self, response, fileType):
         '''Generates a document that represents this advice.
         The document format is specified by p_fileType.'''
diff --git a/AvisLegis.py b/AvisLegis.py
index 80b0efa..8b7ed41 100644
--- a/AvisLegis.py
+++ b/AvisLegis.py
@@ -3836,7 +3836,7 @@ class AvisLegis(BaseContent, AvisOdt):
        {'action': "string:$object_url/generateOdt",
         'category': "document_actions",
         'id': 'asOdt',
-        'name': 'Generer en ODT',
+        'name': u'Générer en ODT',
         'permissions': ("View",),
         'condition': 'python:1'
        },
@@ -3854,6 +3854,11 @@ class AvisLegis(BaseContent, AvisOdt):
                   'decret': "de "
                  }
 
+    security.declarePublic('generateOdt')
+    def generateOdt(self, RESPONSE):
+        '''Generates the ODT version of this advice.'''
+        return self._generate(RESPONSE, 'odt')
+
     security.declarePublic('getResponses')
     def getResponses(self):
         """Returns the predefined responses that are possible for each question.
diff --git a/AvisSimplif.py b/AvisSimplif.py
index 2804840..3784b29 100644
--- a/AvisSimplif.py
+++ b/AvisSimplif.py
@@ -804,22 +804,24 @@ class AvisSimplif(BaseContent, AvisOdt):
     typeDescription = "AvisSimplif"
     typeDescMsgId = 'description_edit_avis_simplif'
 
-    security.declarePublic('generateOdt')
-
     actions =  (
        {'action': "string:$object_url/generateOdt",
         'category': "document_actions",
         'id': 'asOdt',
-        'name': 'Generer en ODT',
+        'name': u'Générer en ODT',
         'permissions': ("View",),
         'condition': 'python:1'
        },
     )
 
-
     _at_rename_after_creation = True
     schema = AvisSimplif_schema
 
+    security.declarePublic('generateOdt')
+    def generateOdt(self, RESPONSE):
+        '''Generates the ODT version of this advice.'''
+        return self._generate(RESPONSE, 'odt')
+
     security.declarePublic('getResponses')
     def getResponses(self):
         """Returns the predefined responses that are possible for each question.