From 1c5f89204981b840e300f81111fbc84240b17ea7 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 18 Jun 2017 20:39:04 -0500
Subject: [PATCH] backfill fixes from 65957e7e to address #470 in active
 release

---
 app/Http/Controllers/Admin/OptionController.php | 2 +-
 app/Repositories/VariableRepository.php         | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Admin/OptionController.php b/app/Http/Controllers/Admin/OptionController.php
index f4a70363a..41c4544a1 100644
--- a/app/Http/Controllers/Admin/OptionController.php
+++ b/app/Http/Controllers/Admin/OptionController.php
@@ -209,7 +209,7 @@ class OptionController extends Controller
 
         try {
             if ($request->input('action') !== 'delete') {
-                $variable = $repo->update($variable, $request->intersect([
+                $variable = $repo->update($variable, $request->only([
                     'name', 'description', 'env_variable',
                     'default_value', 'options', 'rules',
                 ]));
diff --git a/app/Repositories/VariableRepository.php b/app/Repositories/VariableRepository.php
index 576494617..1aded8293 100644
--- a/app/Repositories/VariableRepository.php
+++ b/app/Repositories/VariableRepository.php
@@ -123,12 +123,11 @@ class VariableRepository
         $variable = ServiceVariable::findOrFail($id);
 
         $validator = Validator::make($data, [
-            'name' => 'sometimes|required|string|min:1|max:255',
-            'description' => 'sometimes|nullable|string',
-            'env_variable' => 'sometimes|required|regex:/^[\w]{1,255}$/',
-            'default_value' => 'string',
+            'name' => 'required|string|min:1|max:255',
+            'description' => 'nullable|string',
+            'env_variable' => 'required|regex:/^[\w]{1,255}$/',
+            'rules' => 'bail|required|string',
             'options' => 'sometimes|required|array',
-            'rules' => 'bail|sometimes|required|string|min:1',
         ]);
 
         // Ensure the default value is allowed by the rules provided.