hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implements business fields in view

Browse Source
This commit is contained in:
Romain Neutron
2012-03-21 17:55:32 +01:00
parent 8ecdff40e5
commit 2a69ceac6a
14 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/classes/caption/record.class.php
View File

@@ -198,7 +198,14 @@ class caption_record implements caption_interface, cache_cacheableInterface
foreach ($this->retrieve_fields() as $meta_struct_id => $field)
{
if ($grep_fields && !in_array($field->get_name(), $grep_fields))
{
continue;
}
if($field->get_databox_field()->isBusiness() === true && !$IncludeBusiness)
{
continue;
}
$fields[] = $field;
}
@@ -214,7 +221,7 @@ class caption_record implements caption_interface, cache_cacheableInterface
*/
public function get_field($fieldname)
{
foreach ($this->retrieve_fields() as $meta_struct_id => $field)
foreach ($this->get_fields() as $meta_struct_id => $field)
{
if ($field->get_name() == $fieldname)
return $field;
@@ -230,7 +237,7 @@ class caption_record implements caption_interface, cache_cacheableInterface
*/
public function get_dc_field($label)
{
$fields = $this->retrieve_fields();
$fields = $this->get_fields();
if (isset($this->dces_elements[$label]))
{
return $fields[$this->dces_elements[$label]];
@@ -246,9 +253,9 @@ class caption_record implements caption_interface, cache_cacheableInterface
* @param searchEngine_adapter $searchEngine
* @return array
*/
public function get_highlight_fields($highlight = '', Array $grep_fields = null, searchEngine_adapter $searchEngine = null)
public function get_highlight_fields($highlight = '', Array $grep_fields = null, searchEngine_adapter $searchEngine = null, $includeBusiness = false)
{
return $this->highlight_fields($highlight, $grep_fields, $searchEngine);
return $this->highlight_fields($highlight, $grep_fields, $searchEngine, $includeBusiness);
}
/**
@@ -258,11 +265,11 @@ class caption_record implements caption_interface, cache_cacheableInterface
* @param searchEngine_adapter $searchEngine
* @return array
*/
protected function highlight_fields($highlight, Array $grep_fields = null, searchEngine_adapter $searchEngine = null)
protected function highlight_fields($highlight, Array $grep_fields = null, searchEngine_adapter $searchEngine = null, $includeBusiness = false)
{
$fields = array();
foreach ($this->retrieve_fields() as $meta_struct_id => $field)
foreach ($this->get_fields(array(), $includeBusiness) as $meta_struct_id => $field)
{
if (is_array($grep_fields) && !in_array($field->get_name(), $grep_fields))
continue;