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

Bump version to 3.0.150

Browse Source
This commit is contained in:
Ryan Cramer
2020-02-07 13:42:02 -05:00
parent df33867a44
commit 032df04fe1
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wire/core/ProcessWire.php
View File

@@ -46,7 +46,7 @@ class ProcessWire extends Wire {
* Reversion revision number * Reversion revision number
* *
*/ */
const versionRevision = 149; const versionRevision = 150;
/** /**
* Version suffix string (when applicable) * Version suffix string (when applicable)

16
wire/modules/Fieldtype/FieldtypeInteger.module
View File

@@ -11,6 +11,8 @@
* ProcessWire 3.x, Copyright 2016 by Ryan Cramer * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
* https://processwire.com * https://processwire.com
* *
* @todo allow for more integer types (tiny, small, medium, big) and unsigned option
*
*/ */
class FieldtypeInteger extends Fieldtype { class FieldtypeInteger extends Fieldtype {
@@ -38,13 +40,17 @@ class FieldtypeInteger extends Fieldtype {
} }
public function isEmptyValue(Field $field, $value) { public function isEmptyValue(Field $field, $value) {
if(($value === "0" || $value === 0) && $field->zeroNotEmpty) { if(($value === "0" || $value === 0) && $field->get('zeroNotEmpty')) {
// when zeroNotEmpty option is set, we don't count a literal "0" is being a blank value // when zeroNotEmpty option is set, we don't count a literal "0" is being a blank value
return false; return false;
} }
return empty($value); return empty($value);
} }
public function isDeleteValue(Page $page, Field $field, $value) {
return $this->isEmptyValue($field, $value);
}
public function getBlankValue(Page $page, Field $field) { public function getBlankValue(Page $page, Field $field) {
return ''; return '';
} }
@@ -107,6 +113,7 @@ class FieldtypeInteger extends Fieldtype {
} }
public function getInputfield(Page $page, Field $field) { public function getInputfield(Page $page, Field $field) {
/** @var InputfieldInteger $inputfield */
$inputfield = $this->modules->get('InputfieldInteger'); $inputfield = $this->modules->get('InputfieldInteger');
$inputfield->class = $this->className(); $inputfield->class = $this->className();
return $inputfield; return $inputfield;
@@ -120,6 +127,8 @@ class FieldtypeInteger extends Fieldtype {
public function ___getConfigInputfields(Field $field) { public function ___getConfigInputfields(Field $field) {
$inputfields = parent::___getConfigInputfields($field); $inputfields = parent::___getConfigInputfields($field);
/** @var InputfieldRadios $f */
$f = $this->wire('modules')->get('InputfieldRadios'); $f = $this->wire('modules')->get('InputfieldRadios');
$f->label = $this->_('Are blank and 0 equivalent?'); $f->label = $this->_('Are blank and 0 equivalent?');
$f->description = $this->_('This affects how ProcessWire matches pages during database find operations.') . ' ' . $f->description = $this->_('This affects how ProcessWire matches pages during database find operations.') . ' ' .
@@ -129,15 +138,16 @@ class FieldtypeInteger extends Fieldtype {
$f->attr('name', 'zeroNotEmpty'); $f->attr('name', 'zeroNotEmpty');
$f->addOption(0, $this->_('Yes - Blank and 0 are equivalent')); $f->addOption(0, $this->_('Yes - Blank and 0 are equivalent'));
$f->addOption(1, $this->_('No - Blank and 0 have different meanings')); $f->addOption(1, $this->_('No - Blank and 0 have different meanings'));
$f->attr('value', (int) $field->zeroNotEmpty); $f->attr('value', (int) $field->get('zeroNotEmpty'));
$inputfields->add($f); $inputfields->add($f);
/** @var InputfieldInteger $f */
$f = $this->wire('modules')->get('InputfieldInteger'); $f = $this->wire('modules')->get('InputfieldInteger');
$f->attr('name', 'defaultValue'); $f->attr('name', 'defaultValue');
$f->label = $this->_('Default value'); $f->label = $this->_('Default value');
$f->description = $this->_('This value is assigned as the default for this field on newly created pages. It does not affect existing pages.'); $f->description = $this->_('This value is assigned as the default for this field on newly created pages. It does not affect existing pages.');
$f->collapsed = Inputfield::collapsedBlank; $f->collapsed = Inputfield::collapsedBlank;
$f->attr('value', strlen($field->defaultValue) ? (int) $field->defaultValue : ''); $f->attr('value', strlen($field->get('defaultValue')) ? (int) $field->get('defaultValue') : '');
$inputfields->add($f); $inputfields->add($f);
return $inputfields; return $inputfields;