hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33: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;

14
templates/web/common/caption.html
View File

@@ -5,16 +5,18 @@
{% import 'common/caption_templates/overview.html' as cap_ovr %}
{% import 'common/caption_templates/preview.html' as cap_prev %}
{% set business = user.ACL().has_right_on_base(record.get_base_id(), 'canmodifrecord') %}
{% if view == 'answer' %}
{{cap_ans.format_caption(record, highlight|default(''), searchEngine|default(null))}}
{{cap_ans.format_caption(record, highlight|default(''), searchEngine|default(null), business)}}
{% elseif view == 'lazaret' %}
{{cap_laz.format_caption(record, highlight|default(''), searchEngine|default(null))}}
{{cap_laz.format_caption(record, highlight|default(''), searchEngine|default(null), business)}}
{% elseif view == 'preview' %}
{{cap_prev.format_caption(record, highlight|default(''), searchEngine|default(null))}}
{{cap_prev.format_caption(record, highlight|default(''), searchEngine|default(null), business)}}
{% elseif view == 'basket' %}
{{cap_bas.format_caption(record, highlight|default(''), searchEngine|default(null))}}
{{cap_bas.format_caption(record, highlight|default(''), searchEngine|default(null), business)}}
{% elseif view == 'overview' %}
{{cap_ovr.format_caption(record, highlight|default(''), searchEngine|default(null))}}
{{cap_ovr.format_caption(record, highlight|default(''), searchEngine|default(null), business)}}
{% elseif view == 'publi' %}
{{cap_pub.format_caption(record, '', null)}}
{{cap_pub.format_caption(record, '', null, business)}}
{% endif %}

4
templates/web/common/caption_templates/answer.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine) %}
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/basket_element.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record) %}
{% for name, value in record.get_caption().get_highlight_fields() %}
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/internal_publi.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record) %}
{% for name, value in record.get_caption().get_highlight_fields() %}
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/lazaret.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record) %}
{% for name, value in record.get_caption().get_highlight_fields() %}
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/overview.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record) %}
{% for name, value in record.get_caption().get_highlight_fields() %}
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/preview.html
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine) %}
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

3
templates/web/lightbox/IE6/feed.twig
View File

@@ -85,8 +85,9 @@
<div class="right_column_wrapper right_column_wrapper_caption left unselectable" style="width:230px;height:auto;">
<div id="record_infos">
<div class="container">
{% set business = user.ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %}
{% if first_item %}
{{caption.format_caption(first_item.get_record())}}
{{caption.format_caption(first_item.get_record(), '', null, business)}}
{% endif %}
</div>
</div>

3
templates/web/lightbox/IE6/validate.twig
View File

@@ -95,8 +95,9 @@
<div class="right_column_wrapper right_column_wrapper_caption left unselectable" style="width:230px;height:auto;{% if basket.getValidation() %}display:none;{% endif %}">
<div id="record_infos">
<div class="container">
{% set business = user.ACL().has_right_on_base(basket_element.getRecord().get_base_id(), 'canmodifrecord') %}
{% if basket_element %}
{{caption.format_caption(basket_element.getRecord())}}
{{caption.format_caption(basket_element.getRecord(), '', null, business)}}
{% endif %}
</div>
</div>

3
templates/web/lightbox/feed.twig
View File

@@ -80,8 +80,9 @@
<div class="right_column_wrapper caption right_column_wrapper_caption PNB">
<div id="record_infos" class="PNB">
<div class="container PNB">
{% set business = user.ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %}
{% if first_item %}
{{caption.format_caption(first_item.get_record())}}
{{caption.format_caption(first_item.get_record(), '', null, business)}}
{% endif %}
</div>
</div>

3
templates/web/lightbox/validate.twig
View File

@@ -93,8 +93,9 @@
<div class="right_column_wrapper caption right_column_wrapper_caption PNB" style="{% if basket.getValidation() %}display:none;{% endif %}">
<div id="record_infos" class="PNB">
<div class="container PNB">
{% set business = user.ACL().has_right_on_base(basket_element.getRecord().get_base_id(), 'canmodifrecord') %}
{% if basket_element %}
{{caption.format_caption(basket_element.getRecord())}}
{{caption.format_caption(basket_element.getRecord(), '', null, business)}}
{% endif %}
</div>
</div>

7
templates/web/prod/preview/caption.html
View File

@@ -3,7 +3,7 @@
{% if user.ACL().has_right_on_base(record.get_base_id, 'canmodifrecord') %}
<div class="edit_button" style="text-align:right">
<a href="#" onclick="editThis('IMGT','{{record.get_serialize_key()}}');">
<img style="vertical-align:middle" src="/skins/prod/000000/images/ppen_history.gif" />
<img style="vertical-align:middle" src="/skins/prod/000000/images/ppen_history.gif" />
{% trans 'action : editer' %}
</a>
</div>
@@ -11,10 +11,11 @@
<div style="text-align:center;">
{{record.get_status_icons()|raw}}
</div>
{% set business = user.ACL().has_right_on_base(record.get_base_id(), 'canmodifrecord') %}
{% if record.is_from_reg() %}
{{caption.format_caption(record)}}
{{caption.format_caption(record, '', null, business)}}
{% else %}
{{caption.format_caption(record, highlight, searchEngine)}}
{{caption.format_caption(record, highlight, searchEngine, business)}}
{% endif %}
<hr style="margin:10px 0;"/>
{% include 'common/technical_datas.twig' %}

5
templates/web/prod/results/answerlist.html
View File

@@ -19,7 +19,8 @@
<td valign="top">
<div class='desc' style='max-height:{{th_size+70}}px;overflow-y:auto;'>
<div class="fixeddesc">
{{caption.format_caption(record, highlight, searchEngine)}}
{% set business = user.ACL().has_right_on_base(record.get_base_id(), 'canmodifrecord') %}
{{caption.format_caption(record, highlight, searchEngine, business)}}
{% if user.getPrefs('technical_display') == 'group' %}<hr/>{{record.get_technical_infos|raw}}{% endif %}
</div>
</div>
@@ -28,6 +29,6 @@
</table>
</div>
{% endfor %}
{% endblock %}