mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
File modification fior gallery
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.1.0@42515 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
d40c04e1a3
commit
76ffdd4acb
@ -29,11 +29,7 @@ class File extends DataObject {
|
||||
"Title" => "Varchar(255)",
|
||||
"Filename" => "Varchar(255)",
|
||||
"Content" => "Text",
|
||||
"Sort" => "Int",
|
||||
"PopupWidth" => "Int",
|
||||
"PopupHeight" => "Int",
|
||||
"Embed" => "Boolean",
|
||||
'LimitDimensions' => 'Boolean'
|
||||
"Sort" => "Int"
|
||||
);
|
||||
static $indexes = array(
|
||||
"SearchFields" => "fulltext (Filename,Title,Content)",
|
||||
@ -594,10 +590,13 @@ class File extends DataObject {
|
||||
* be a better way of approaching this?
|
||||
*/
|
||||
public function instance_get($filter = "", $sort = "", $join = "", $limit="", $containerClass = "DataObjectSet", $having="") {
|
||||
if($this->hasMethod('alternative_instance_get')) return $this->alternative_instance_get($filter, $sort, $join, $limit, $containerClass, $having);
|
||||
|
||||
$query = $this->extendedSQL($filter, $sort, $limit, $join, $having);
|
||||
$baseTable = reset($query->from);
|
||||
|
||||
$query->select = array("$baseTable.ID","$baseTable.ClassName","$baseTable.Created","$baseTable.LastEdited","$baseTable.Name","$baseTable.Title","$baseTable.Content","$baseTable.ParentID","$baseTable.Filename","if($baseTable.ClassName,$baseTable.ClassName,'File') AS RecordClassName");
|
||||
|
||||
$query->select = array("$baseTable.ID","$baseTable.ClassName","$baseTable.Created","$baseTable.LastEdited","$baseTable.Name","$baseTable.Title","$baseTable.Content","$baseTable.ParentID","$baseTable.Filename","if($baseTable.ClassName,$baseTable.ClassName,'File') AS RecordClassName","$baseTable.PopupWidth","$baseTable.PopupHeight","$baseTable.Embed","$baseTable.LimitDimensions");
|
||||
$records = $query->execute();
|
||||
$ret = $this->buildDataObjectSet($records, $containerClass);
|
||||
if($ret) $ret->parseQueryLimit($query);
|
||||
|
Loading…
Reference in New Issue
Block a user