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

Additional wireCount updates per processwire/processwire-issues#408

Browse Source
This commit is contained in:
Ryan Cramer
2018-02-26 10:16:12 -05:00
parent ac779c79a8
commit 7c0012fbd9
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wire/modules/Fieldtype/FieldtypeOptions/FieldtypeOptions.module
View File

@@ -106,7 +106,7 @@ class FieldtypeOptions extends FieldtypeMulti implements Module {
if(empty($value) || !count($value)) { if(empty($value) || !count($value)) {
$page->set($field->name, $field->initValue); $page->set($field->name, $field->initValue);
} }
} else if($this->wire('process') != 'ProcessField' && !count($value)) { } else if($this->wire('process') != 'ProcessField' && !wireCount($value)) {
$this->warning( $this->warning(
$field->getLabel() . " ($field->name): " . $field->getLabel() . " ($field->name): " .
$this->_('Configured pre-selection not populated since value is not always required. Please correct this field configuration.') $this->_('Configured pre-selection not populated since value is not always required. Please correct this field configuration.')
@@ -469,7 +469,7 @@ class FieldtypeOptions extends FieldtypeMulti implements Module {
/** /**
* Get all options available for the given field * Get all options available for the given field
* *
* @param id|string|Field $field Field name, id or object * @param int|string|Field $field Field name, id or object
* @return SelectableOptionArray * @return SelectableOptionArray
* @throws WireException * @throws WireException
* *
@@ -481,7 +481,7 @@ class FieldtypeOptions extends FieldtypeMulti implements Module {
/** /**
* Update, add, delete as needed to match the given $options * Update, add, delete as needed to match the given $options
* *
* @param id|string|Field $field Field name, id or object * @param int|string|Field $field Field name, id or object
* @param SelectableOptionArray $options Options to save * @param SelectableOptionArray $options Options to save
* @return array Summary of what occurred * @return array Summary of what occurred
* @throws WireException * @throws WireException

7
wire/modules/Fieldtype/FieldtypeURL.module
View File

@@ -48,6 +48,7 @@ class FieldtypeURL extends FieldtypeText {
public function getInputfield(Page $page, Field $field) { public function getInputfield(Page $page, Field $field) {
/** @var InputfieldURL $inputfield */
$inputfield = $this->modules->get('InputfieldURL'); $inputfield = $this->modules->get('InputfieldURL');
$inputfield->set('noRelative', $field->noRelative); $inputfield->set('noRelative', $field->noRelative);
$inputfield->set('addRoot', $field->addRoot); $inputfield->set('addRoot', $field->addRoot);
@@ -68,12 +69,16 @@ class FieldtypeURL extends FieldtypeText {
$labelYes = $this->_('Yes'); $labelYes = $this->_('Yes');
$labelNo = $this->_('No'); $labelNo = $this->_('No');
/** @var InputfieldAsmSelect $f */
$f = $inputfields->getChildByName('textformatters'); $f = $inputfields->getChildByName('textformatters');
$f->notes = $this->_('The "HTML Entity Encoder" text formatter is recommended for URL fields.'); $f->notes = $this->_('The "HTML Entity Encoder" text formatter is recommended for URL fields.');
if(!count($field->textformatters) || !in_array('TextformatterEntities', $field->textformatters)) { $textformatters = $field->get('textformatters');
if(!is_array($textformatters)) $textformatters = array();
if(!count($textformatters) || !in_array('TextformatterEntities', $textformatters)) {
$this->warning($this->_('If this URL will be used for any output, it is strongly recommended that you select the "HTML Entity Encoder" for "Text Formatters" on the Details tab.')); // Wwarning to use the HTML entity encoder $this->warning($this->_('If this URL will be used for any output, it is strongly recommended that you select the "HTML Entity Encoder" for "Text Formatters" on the Details tab.')); // Wwarning to use the HTML entity encoder
} }
/** @var InputfieldRadios $f */
$f = $this->modules->get('InputfieldRadios'); $f = $this->modules->get('InputfieldRadios');
$f->attr('name', 'noRelative'); $f->attr('name', 'noRelative');
$f->label = $this->_('Allow relative/local URLs without "http://" at the beginning?'); $f->label = $this->_('Allow relative/local URLs without "http://" at the beginning?');