lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Don’t make required encrypted custom fields required if user is not an admin

Browse source
This commit is contained in:
snipe 2016-08-25 21:03:52 -07:00
parent 96eb832fd3
commit 537ad28a67
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Models/CustomFieldset.php
View file

@ -2,6 +2,7 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Gate;
class CustomFieldset extends Model class CustomFieldset extends Model
{ {
@ -30,16 +31,21 @@ class CustomFieldset extends Model
{ {
$rules=[]; $rules=[];
foreach ($this->fields as $field) { foreach ($this->fields as $field) {
$rule=[]; $rule = [];
if ($field->pivot->required) {
$rule[]="required"; if (($field->field_encrypted!='1') ||
(($field->field_encrypted =='1') && (Gate::allows('admin')) ))
{
if ($field->pivot->required) {
$rule[]="required";
}
} }
array_push($rule, $field->attributes['format']); array_push($rule, $field->attributes['format']);
$rules[$field->db_column_name()]=$rule; $rules[$field->db_column_name()]=$rule;
} }
return $rules; return $rules;
} }
//requiredness goes *here*
//sequence goes here?
} }