Changeset 57110

Timestamp:

30/06/08 17:08:43 (2 months ago)

Author:

nlou

Message:

FEATURE:

Location:

modules/sapphire/branches/roa

Files:

• core/model/DataObject.php (modified) (1 diff)
• forms/TableListField.php (modified) (10 diffs)
• search/SearchContext.php (modified) (1 diff)

modules/sapphire/branches/roa/core/model/DataObject.php

@@ -2590 +2590 @@
          */
         public static $summary_fields = null;
+        
+        /**
+         * User defined permissions for search result table by ModelAdmin to act on.
+         * Such as print search
+         */
+        public static $results_permissions = null;
 
 }

modules/sapphire/branches/roa/forms/TableListField.php

@@ -173 +173 @@
         
         /**
+         * @var array Specify custom escape for the fields, e.g. to escape all accurance of "\r", "\r\n" and "\n" of the field 
+         * value, we need to set this field as array("\r"=>"", "\r\n"=>"", "\n"=>"") ;
+         * Example: setFieldEscape(array("\""=>"\"\"","\r"=>"", "\r\n"=>"", "\n"=>"") is needed for exporting the table to a .csv 
+         * file
+         */
+        public $fieldEscape = array();
+        
+        /**
          * @var string
          */
@@ -319 +327 @@
                         $dataQuery = $this->getQuery();
                         
-                        // we don't limit when doing certain actions
+                        // we don't limit when doing certain actions        T
                         if(!isset($_REQUEST['methodName']) || !in_array($_REQUEST['methodName'],array('printall','export'))) {
                                 $dataQuery->limit(array(
@@ -342 +350 @@
                 $fieldItems = new DataObjectSet();
                 if($items = $this->sourceItems()) foreach($items as $item) {
+                        $fieldItem = new TableListField_Item($item, $this);
                         if($item) $fieldItems->push(new TableListField_Item($item, $this));
                 }
-
                 return $fieldItems;
         }
@@ -747 +755 @@
                         $this->totalCount = $record['TotalCount'];
                 }
-
                 return $this->totalCount;
         }
@@ -790 +797 @@
         
         /**
+         * Get the CSV separator character.  Defaults to ,
+         */
+        function getCsvSeparator() {
+                return $this->csvSeparator;
+        }
+        
+        /**
          * Remove the header row from the CSV export
          */
@@ -819 +833 @@
                 $dataQuery = $this->getCsvQuery();
                 $records = $dataQuery->execute();
+                
                 $sourceClass = $this->sourceClass;
                 $dataobject = new $sourceClass();
                 $items = $dataobject->buildDataObjectSet($records, 'DataObjectSet');
                 
-                if($items) {
-                        foreach($items as $item) {
-                                $columnData = array();
-                                foreach($csvColumns as $columnName => $columnTitle) {
-                                        $tmpColumnData = "\"" . str_replace("\"", "\"\"", $item->$columnName) . "\"";
-                                        $tmpColumnData = str_replace(array("\r", "\n"), "", $tmpColumnData);
-                                        $columnData[] = $tmpColumnData;
-                                }
-                                $fileData .= implode($separator, $columnData);
-                                $fileData .= "\n";
-                        }
+                $fieldItems = new DataObjectSet();
+                
+                if($items&&$items->count()) foreach($items as $item) {
+                        $fieldItem = new TableListField_Item($item, $this);
+                        if($item) $fieldItems->push(new TableListField_Item($item, $this));
+                }
+                
+                $this->setFieldFormatting(array());
+                $this->setFieldEscape(array(
+                        "\""=>"\"\"",
+                        "\r\n"=>"", 
+                        "\r"=>"",
+                        "\n"=>"",
+                ));
+
+                if($fieldItems) {
+
+                        foreach($fieldItems as $fieldItem) {
+                                $fileData .= $fieldItem->renderwith("TableListField_Item_export");
+                        }
+
                         HTTP::sendFileToBrowser($fileData, $fileName);
                 } else {
@@ -845 +870 @@
          */
         function ExportLink() {
-                return Controller::join_links($this->Link(), 'export');
+                $exportLink = Controller::join_links($this->Link(), 'export');
+                if($this->extraLinkParams) $exportLink .= "?" . http_build_query($this->extraLinkParams);
+                return $exportLink;
         }
 
@@ -909 +936 @@
         function setFieldFormatting($formatting) {
                 $this->fieldFormatting = $formatting;
+        }
+        
+        function setFieldEscape($escape){
+                $this->fieldEscape = $escape;
         }
         
@@ -1064 +1095 @@
                                 eval('$value = "' . $format . '";');
                         }
+                        
+                        //escape
+                        if($escape = $this->parent->fieldEscape){
+                                foreach($escape as $search => $replace){
+                                        $value = str_replace($search, $replace, $value);
+                                }
+                        }
                                                 
                         $fields[] = new ArrayData(array(
@@ -1069 +1107 @@
                                 "Title" => $fieldTitle,
                                 "Value" => $value,
+                                "CsvSeparator" => $this->parent->getCsvSeparator(),
                         ));
                 }
-                
                 return new DataObjectSet($fields);
         }

modules/sapphire/branches/roa/search/SearchContext.php

@@ -115 +115 @@
                 $query->orderby($SQL_sort);
                 foreach($searchParams as $key => $value) {
-                        //if ($value != '0') {
+                         /*We add $value!='' here to not include a filter like this: $fieldname like '%%', which abviously filter out some
+                                records with the $fieldname set to null. and this is not the search intention.
+                        */
+                        if ($value != '0'&&$value!='') {
                                 $key = str_replace('__', '.', $key);
                                 $filter = $this->getFilter($key);