Changeset 9610

Timestamp:

10 Nov 2012, 08:25:17 (12 years ago)

Author:

Henrik Bettermann

Message:

Limit number of files in data center.

Location:

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

Files:

• pages.py (modified) (3 diffs)
• templates/datacenterpage.pt (modified) (1 diff)

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

@@ -832 +832 @@
     label = _(u'Data Center')
     pnav = 0
-    max_files = 10
 
     def update(self):
         datatable.need()
         warning.need()
-        self.max_exceeded = False
-        number_of_pendings = len(self.context.getPendingFiles())
-        if number_of_pendings > self.max_files:
-            self.max_exceeded = True
         return super(DatacenterPage, self).update()
 
@@ -887 +882 @@
     label = _(u'Upload portal data as CSV file')
     pnav = 0
+    max_files = 10
     upload_button =_(u'Upload')
     cancel_button =_(u'Cancel')
@@ -965 +961 @@
     def update(self, uploadfile=None, import_mode=None,
                importer=None, CANCEL=None, SUBMIT=None):
+        number_of_pendings = len(self.context.getPendingFiles())
+        if number_of_pendings > self.max_files:
+            self.flash(
+                _('Maximum number of files in the data center exceeded.'))
+            self.redirect(self.url(self.context))
+            return
         if CANCEL is not None:
             self.redirect(self.url(self.context))

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterpage.pt

@@ -1 @@
-<p class="alert-message warning" i18n:translate=""
-  tal:condition="view/max_exceeded">
-  <strong>NOTICE:</strong>
-  There are more than
-  <span tal:content="view/max_files" i18n:name="count">50</span>
-  pending files in the data center. Please repair them first before uploading
-  new files. Download and edit their records according to the error
-  messages in the last column.
-  Do not change file names when re-uploading files.
-  If a file contains no more data for import just remove it.
-</p>
-
 <p  i18n:domain="waeup.kofa" i18n:translate="">
 The data center helps you to manage portal data. You can upload CSV