Changeset 12456

Timestamp:

13 Jan 2015, 06:23:01 (10 years ago)

Author:

Henrik Bettermann

Message:

Omit document_id on manage pages. Rename sample.pdf.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/documents

Files:

• browser.py (modified) (1 diff)
• document.py (modified) (1 diff)
• fileviewlets.py (modified) (3 diffs)
• tests/test_browser.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/documents/browser.py

@@ -262 +262 @@
     @property
     def form_fields(self):
-        return grok.AutoFields(self.context.form_fields_interface)
+        return grok.AutoFields(
+            self.context.form_fields_interface).omit('document_id')
 
     def label(self):

main/waeup.kofa/trunk/src/waeup/kofa/documents/document.py

@@ -145 +145 @@
     grok.provides(IPDFDocument)
 
-    filenames = ('sample.pdf',)
+    filenames = ('file.pdf',)
 
     form_fields_interface = IPDFDocument

main/waeup.kofa/trunk/src/waeup/kofa/documents/fileviewlets.py

@@ -41 +41 @@
     title = _(u'PDF File')
     mus = 1024 * 200
-    download_name = u'sample.pdf'
+    download_name = u'file.pdf'
     tab_redirect = '#tab2'
 
@@ -58 +58 @@
     label = _(u'PDF Scan')
     title = _(u'PDF Scan')
-    download_name = u'sample.pdf'
+    download_name = u'file.pdf'
 
     @property
@@ -69 +69 @@
     """
     ##: Needs to be protected if not published
-    grok.name('sample.pdf')
+    grok.name('file.pdf')
     grok.context(PDFDocument)
     grok.require('waeup.Public')
-    download_name = u'sample.pdf'
+    download_name = u'file.pdf'
 
     @property

main/waeup.kofa/trunk/src/waeup/kofa/documents/tests/test_browser.py

@@ -148 +148 @@
             name='upload_pdfscanmanageupload').click()
         self.assertTrue(
-            'href="http://localhost/app/documents/DOC1/sample.pdf">DOC1.pdf</a>'
+            'href="http://localhost/app/documents/DOC1/file.pdf">DOC1.pdf</a>'
             in self.browser.contents)
         # The file can be found in the file system
         file = getUtility(IExtFileStore).getFileByContext(
-            document, attr='sample.pdf')
+            document, attr='file.pdf')
         file_content = file.read()
         pdf.seek(0)
@@ -164 +164 @@
             in self.browser.contents)
         IWorkflowState(document).setState(PUBLISHED)
-        self.browser.open(self.container_path + '/DOC1/sample.pdf')
+        self.browser.open(self.container_path + '/DOC1/file.pdf')
         self.assertEqual(
             self.browser.headers['content-type'], 'application/pdf')
@@ -190 +190 @@
         # File has been removed too
         file = getUtility(IExtFileStore).getFileByContext(
-            document, attr='sample.pdf')
+            document, attr='file.pdf')
         self.assertTrue(file is None)
 
@@ -208 +208 @@
             % document.document_id in logcontent)
         self.assertTrue(
-            'INFO - zope.mgr - documents.browser.DocumentManageFormPage - %s - uploaded: sample.pdf (my_sample_scan.pdf)'
+            'INFO - zope.mgr - documents.browser.DocumentManageFormPage - %s - uploaded: file.pdf (my_sample_scan.pdf)'
             % document.document_id in logcontent)
         self.assertTrue(