mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-24 02:13:15 +00:00
Merge branch 'master' into PHRAS-2719_Edit_form_unable_to_select_value_in_mutivalue_field
This commit is contained in:
@@ -354,6 +354,7 @@ class PDFRecords extends PDF
|
|||||||
$this->pdf->SetY($y + 2);
|
$this->pdf->SetY($y + 2);
|
||||||
|
|
||||||
foreach ($rec->get_caption()->get_fields() as $field) {
|
foreach ($rec->get_caption()->get_fields() as $field) {
|
||||||
|
if ($field->get_databox_field()->get_gui_visible()) {
|
||||||
$this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
|
$this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
|
||||||
$this->pdf->Write(5, $field->get_name() . " : ");
|
$this->pdf->Write(5, $field->get_name() . " : ");
|
||||||
|
|
||||||
@@ -367,6 +368,7 @@ class PDFRecords extends PDF
|
|||||||
|
|
||||||
$this->pdf->Write(6, "\n");
|
$this->pdf->Write(6, "\n");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$this->pdf->SetY($this->pdf->GetY() + 10);
|
$this->pdf->SetY($this->pdf->GetY() + 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -679,6 +681,8 @@ class PDFRecords extends PDF
|
|||||||
$this->pdf->Write(12, "\n");
|
$this->pdf->Write(12, "\n");
|
||||||
foreach ($rec->get_caption()->get_fields() as $field) {
|
foreach ($rec->get_caption()->get_fields() as $field) {
|
||||||
/* @var $field caption_field */
|
/* @var $field caption_field */
|
||||||
|
|
||||||
|
if ($field->get_databox_field()->get_gui_visible()) {
|
||||||
if ($nf > 0) {
|
if ($nf > 0) {
|
||||||
$this->pdf->Write(6, "\n");
|
$this->pdf->Write(6, "\n");
|
||||||
}
|
}
|
||||||
@@ -700,6 +704,7 @@ class PDFRecords extends PDF
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user