From c7b877a864f9d48b23d42e8b7be343f23ab2fd1c Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Sun, 26 Feb 2017 16:22:21 -0600 Subject: [PATCH] Merge --- src/Assignment/Form/AssignmentFormFields.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Assignment/Form/AssignmentFormFields.php b/src/Assignment/Form/AssignmentFormFields.php index e5ae869ee..9e6af82d5 100644 --- a/src/Assignment/Form/AssignmentFormFields.php +++ b/src/Assignment/Form/AssignmentFormFields.php @@ -54,11 +54,13 @@ public function handle(AssignmentFormBuilder $builder) 'instructions' => 'streams::assignment.translatable.instructions', 'type' => 'anomaly.field_type.boolean', 'warning' => function (AssignmentFormBuilder $builder) { + $type = $builder->getFieldType(); - return $type->getColumnType() == null ? 'streams::assignment.translatable.warning' : null; + return (!$type->getColumnType()) ? 'streams::assignment.translatable.warning' : null; }, 'disabled' => function (AssignmentFormBuilder $builder) { + $stream = $builder->getStream(); if ($stream && !$stream->isTranslatable()) { @@ -67,7 +69,7 @@ public function handle(AssignmentFormBuilder $builder) $type = $builder->getFieldType(); - return $type->getColumnType() == null; + return (!$type->getColumnType()); }, ], ]