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

Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-04 18:13:36 +01:00
parent 4aee5923e2 3e2ec0d385
commit 56abfbf5bc
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/record/adapter.class.php
View File

@@ -1179,7 +1179,9 @@ class record_adapter implements record_Interface, cache_cacheableInterface
foreach ($mandatoryParams as $param) foreach ($mandatoryParams as $param)
{ {
if (!array_key_exists($param, $params)) if (!array_key_exists($param, $params))
throw new Exception_InvalidArgument(); {
throw new Exception_InvalidArgument(sprintf('Invalid metadata, missing key %s', $param));
}
} }
if (!is_array($params['value'])) if (!is_array($params['value']))

27
lib/classes/record/preview.class.php
View File

@@ -274,40 +274,39 @@ class record_preview extends record_adapter
{ {
if ($this->title) if ($this->title)
return $this->title; return $this->title;
$this->title = collection::getLogo($this->get_base_id()) . ' '; $this->title = collection::getLogo($this->get_base_id()) . ' ';
switch ($this->env) switch ($this->env)
{ {
case "RESULT": case "RESULT":
$this->title .= sprintf( $this->title .= sprintf(
_('preview:: resultat numero %s '), '<span id="current_result_n">' . ($this->number + 1) _('preview:: resultat numero %s '), '<span id="current_result_n">' . ($this->number + 1)
. '</span>' . '</span> : '
); );
$title = parent::get_title(); $this->title .= parent::get_title($highlight, $search_engine);
if ($search_engine instanceof searchEngine_adapter)
{
$this->title .= array_pop($search_engine->build_excerpt($highlight, array($title), $this));
}
else
{
$this->title .= $title;
}
break; break;
case "BASK": case "BASK":
$this->title .= $this->name . ' - ' . parent::get_title() $this->title .= $this->name . ' - ' . parent::get_title($highlight, $search_engine)
. ' (' . $this->get_number() . '/' . $this->total . ') '; . ' (' . $this->get_number() . '/' . $this->total . ') ';
break; break;
case "REG": case "REG":
$title = parent::get_title();
if ($this->get_number() == 0) if ($this->get_number() == 0)
$this->title .= _('preview:: regroupement '); {
$this->title .= $title;
}
else else
{
$this->title .= sprintf( $this->title .= sprintf(
_('preview:: Previsualisation numero %s '), $this->get_number() . '/' . $this->total _('%s %d/%d '), $title, $this->get_number() . '/' . $this->total
); );
}
break; break;
default: default:
$this->title .= parent::get_title(); $this->title .= parent::get_title($highlight, $search_engine);
break; break;
} }

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

@@ -9,6 +9,10 @@
<div style="text-align:center;"> <div style="text-align:center;">
{{record.get_status_icons()|raw}} {{record.get_status_icons()|raw}}
</div> </div>
{{caption.format_caption(record, highlight, searchEngine)}} {% if record.is_from_reg() %}
{{caption.format_caption(record)}}
{% else %}
{{caption.format_caption(record, highlight, searchEngine)}}
{% endif %}
<hr style="margin:10px 0;"/> <hr style="margin:10px 0;"/>
{% include 'common/technical_datas.twig' %} {% include 'common/technical_datas.twig' %}

3
www/prod/jquery.edit.js
View File

@@ -1840,6 +1840,7 @@ function preset_load(preset_id)
{ {
p4.edit.T_records[r].fields[""+i] = { p4.edit.T_records[r].fields[""+i] = {
value:[], value:[],
"meta_struct_id":p4.edit.T_fields[i].meta_struct_id,
dirty:true dirty:true
};// = { };// = {
var n = 0; var n = 0;
@@ -1853,6 +1854,7 @@ function preset_load(preset_id)
{ {
p4.edit.T_records[r].fields[""+i] = { p4.edit.T_records[r].fields[""+i] = {
"value":p4.edit.T_fields[i].preset[0], "value":p4.edit.T_fields[i].preset[0],
"meta_struct_id":p4.edit.T_fields[i].meta_struct_id,
"dirty":true "dirty":true
}; };
} }
@@ -1875,7 +1877,6 @@ function preset_load(preset_id)
function hsplit1() function hsplit1()
{ {
var el = $('#EDIT_TOP'); var el = $('#EDIT_TOP');