mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-17 20:11:46 +02:00
Code Issues Releases Wiki Activity

Fix processwire/processwire-issues#67 where Inputfield::collapsedBlank behavior only applied to default language in multi-language fields

Browse Source
This commit is contained in:
Ryan Cramer
2016-11-02 06:26:39 -04:00
parent e374bee288
commit a864d6a4a1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wire/core/InputfieldWrapper.php
View File

@@ -409,6 +409,7 @@ class InputfieldWrapper extends Inputfield implements \Countable, \IteratorAggre
$ffOut = $this->renderInputfield($inputfield, $renderValueMode); $ffOut = $this->renderInputfield($inputfield, $renderValueMode);
if(!strlen($ffOut)) continue; if(!strlen($ffOut)) continue;
$collapsed = (int) $inputfield->getSetting('collapsed'); // retrieve again after render
$entityEncodeText = $inputfield->getSetting('entityEncodeText') === false ? false : true; $entityEncodeText = $inputfield->getSetting('entityEncodeText') === false ? false : true;
$errorsOut = ''; $errorsOut = '';

6
wire/modules/LanguageSupport/LanguageSupport.module
View File

@@ -419,7 +419,7 @@ class LanguageSupport extends WireData implements Module, ConfigurableModule {
$id = $inputfield->attr('id'); $id = $inputfield->attr('id');
$value = $inputfield->attr('value'); $value = $inputfield->attr('value');
$required = $inputfield->required; $required = $inputfield->required;
$collapsed = $inputfield->collapsed;
$trackChanges = $inputfield->trackChanges(); $trackChanges = $inputfield->trackChanges();
$inputfield->setTrackChanges(false); $inputfield->setTrackChanges(false);
if($this->languageTabs) $this->languageTabs->resetTabs(); if($this->languageTabs) $this->languageTabs->resetTabs();
@@ -445,6 +445,10 @@ class LanguageSupport extends WireData implements Module, ConfigurableModule {
$o = $renderValueMode ? $inputfield->___renderValue() : $inputfield->___render(); $o = $renderValueMode ? $inputfield->___renderValue() : $inputfield->___render();
} }
if($collapsed == Inputfield::collapsedBlank && !$inputfield->isEmpty()) {
$inputfield->collapsed = Inputfield::collapsedNo;
}
$out .= $this->wrapInputfieldOutput($o, $newID, $language); $out .= $this->wrapInputfieldOutput($o, $newID, $language);
if($this->languageTabs) $this->languageTabs->addTab($inputfield, $language); if($this->languageTabs) $this->languageTabs->addTab($inputfield, $language);
} }