Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-13 20:23:46 +02:00
Code Issues Packages Projects Releases Activity

Bluprints: Move validation parameter inside the form

Browse Source
This commit is contained in:
Matias Griese
2014-10-10 12:27:41 +03:00
parent 5a6e32fce7
commit fd9816c177
10 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/blueprints/config/media.yaml
View File

@@ -1,5 +1,5 @@
title: Media
validation: loose
form:
validation: loose
fields:

1
system/blueprints/config/site.yaml
View File

@@ -1,5 +1,6 @@
title: Site
form:
validation: loose
fields:
content:

2
system/blueprints/config/streams.yaml
View File

@@ -1,7 +1,7 @@
title: File Streams
validation: loose
form:
validation: loose
fields:
schemes.xxx:
type: array

1
system/blueprints/config/system.yaml
View File

@@ -1,6 +1,7 @@
title: System
form:
validation: loose
fields:
content:

1
system/blueprints/pages/modular_new.yaml
View File

@@ -5,6 +5,7 @@ rules:
max: 80
form:
validation: loose
fields:
title:

1
system/blueprints/pages/modular_raw.yaml
View File

@@ -5,6 +5,7 @@ rules:
max: 80
form:
validation: loose
fields:
tabs:

1
system/blueprints/pages/new.yaml
View File

@@ -5,6 +5,7 @@ rules:
max: 80
form:
validation: loose
fields:
title:

1
system/blueprints/pages/page.yaml
View File

@@ -5,6 +5,7 @@ rules:
max: 80
form:
validation: loose
fields:
title:

1
system/blueprints/pages/raw.yaml
View File

@@ -5,6 +5,7 @@ rules:
max: 80
form:
validation: loose
fields:
tabs:

4
system/src/Grav/Common/Data/Blueprint.php
View File

@@ -268,7 +268,7 @@ class Blueprint
} elseif (is_array($field) && is_array($val)) {
// Array has been defined in blueprints.
$this->validateArray($field, $val);
} elseif (isset($this->items['validation']) && $this->items['validation'] == 'strict') {
} elseif (isset($this->items['form']['validation']) && $this->items['form']['validation'] == 'strict') {
// Undefined/extra item.
throw new \RuntimeException(sprintf('%s is not defined in blueprints', $key));
}
@@ -294,7 +294,7 @@ class Blueprint
} elseif (is_array($field) && is_array($val)) {
// Array has been defined in blueprints.
$field = $this->filterArray($field, $val);
} elseif (isset($this->items['validation']) && $this->items['validation'] == 'strict') {
} elseif (isset($this->items['form']['validation']) && $this->items['form']['validation'] == 'strict') {
$field = null;
}