DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-09-29 03:48:37 -07:00
parent db59d4b2c4 c6069b905b
commit 5a1225a8bf
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Models/CustomFieldset.php
View file

@ -47,9 +47,7 @@ class CustomFieldset extends Model
if (($field->field_encrypted!='1') || if (($field->field_encrypted!='1') ||
(($field->field_encrypted =='1') && (Gate::allows('admin')) )) { (($field->field_encrypted =='1') && (Gate::allows('admin')) )) {
if ($field->pivot->required) { $rule[] = ($field->pivot->required=='1') ? "required" : "nullable";
$rule[]="required";
}
} }
array_push($rule, $field->attributes['format']); array_push($rule, $field->attributes['format']);

8
config/version.php
View file

@ -1,7 +1,7 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.0.5', 'app_version' => 'v4.0.6',
'build_version' => '40', 'build_version' => '47',
'hash_version' => 'g42c2a66', 'hash_version' => 'g2e76620',
'full_hash' => 'v4.0.5-40-g42c2a66', 'full_hash' => 'v4.0.6-47-g2e76620',
); );