Changeset 9074 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

28 Jul 2012, 04:47:58 (12 years ago)

Author:

Henrik Bettermann

Message:

Fix export finished file name.

Sort files by upload date.

Location:

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

Files:

• browser/pages.py (modified) (1 diff)
• browser/static/datatable.js (modified) (1 diff)
• browser/templates/datacenterfinishedpage.pt (modified) (1 diff)
• browser/templates/datacenterpage.pt (modified) (1 diff)
• datacenter.py (modified) (2 diffs)
• interfaces.py (modified) (1 diff)

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

@@ -920 +920 @@
             'Content-Type', 'text/csv; charset=UTF-8')
         self.response.setHeader(
-            'Content-Disposition:', 'attachment; filename="%s.csv' %
-            self.filename.replace('.csv',''))
+            'Content-Disposition:', 'attachment; filename="%s' %
+            self.filename.replace('finished/',''))
         fullpath = os.path.join(self.context.storage, self.filename)
         return open(fullpath, 'rb').read()

main/waeup.kofa/trunk/src/waeup/kofa/browser/static/datatable.js

@@ -1 +1 @@
 $(document).ready(function(){
-    $('.dataTable').dataTable();
+  $('.dataTable').dataTable();
+
+        $('.dataTableFiles').dataTable( {
+                "aaSorting": [[ 2, "desc" ]],
+        } );
+
         $('.dataTableManage').dataTable( {
                 "aaSorting": [[ 1, "asc" ]],
                 "aoColumnDefs":[{ "bSortable": false, "aTargets": [ 0 ] }]
         } );
+
+        $('.dataTableManageFiles').dataTable( {
+                "aaSorting": [[ 3, "desc" ]],
+                "aoColumnDefs":[{ "bSortable": false, "aTargets": [ 0 ] }]
+        } );
+
+
 });
 

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

@@ -1 @@
-<table i18n:domain="waeup.kofa" class="display dataTable">
+<table i18n:domain="waeup.kofa" class="display dataTableFiles">
   <thead>
     <tr>

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

@@ -11 +11 @@
 <form action="." tal:attributes="action request/URL" method="post"
       i18n:domain="waeup.kofa" enctype="multipart/form-data">
-    <table i18n:domain="waeup.kofa" class="display dataTableManage">
+    <table i18n:domain="waeup.kofa" class="display dataTableManageFiles">
       <thead>
         <tr>

main/waeup.kofa/trunk/src/waeup/kofa/datacenter.py

@@ -87 +87 @@
         return result
 
-    def getFinishedFiles(self, sort='name'):
+    def getFinishedFiles(self):
         """Get a list of files stored in `finished` subfolder of `storage`.
 
-        Files are sorted by basename.
+        Files are unsorted.
         """
         result = []
@@ -103 +103 @@
                 continue
             result.append(DataCenterFile(fullpath, 'finished'))
-        if sort == 'date':
-            # sort results in newest-first order...
-            result = sorted(result, key=lambda x: x.getTimeStamp(),
-                            reverse=True)
         return result
 

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -645 +645 @@
         """
 
-    def getFinishedFiles(sort='name'):
-        """Get a list of files stored in `finished` subfolder of `storage`
-        sorted by basename.
+    def getFinishedFiles():
+        """Get a list of files stored in `finished` subfolder of `storage`.
         """