From 811e0ba5b2758aef1343d7bd1ea009808b7b654b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Tue, 26 Jan 2016 23:26:48 +0100
Subject: [PATCH] FIX: make possible values work as intended

Newlines in possible values in custom fields are now replaced by pipe (|). This commit also fixes typo caused by copy-paste (resource was sent as type).
---
 app/Http/Controllers/Admin/CreateNewCustomField.php  | 8 ++++----
 resources/views/admin/customFields/newForm.blade.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Admin/CreateNewCustomField.php b/app/Http/Controllers/Admin/CreateNewCustomField.php
index ff1222ef..ed452eea 100644
--- a/app/Http/Controllers/Admin/CreateNewCustomField.php
+++ b/app/Http/Controllers/Admin/CreateNewCustomField.php
@@ -24,8 +24,7 @@ class CreateNewCustomField extends Controller
     {
         $customField = new CustomField();
 
-        // @todo add support for determination of resource for custom field (module, user, ...)
-        // @todo add possible values
+        // set mandatory fields
 
         $customField->name = $request->name;
         $customField->type_id = $request->type;
@@ -38,8 +37,9 @@ class CreateNewCustomField extends Controller
             $customField->description = $request->description;
         }
 
-        if ($request->possibleValues)
-            $customField->possible_values = $request->possibleValues;
+        if ($request->possibleValues) {
+            $customField->possible_values = trim(preg_replace('~[\r\n]+~', '|', $request->possibleValues));
+        }
 
         if ($request->defaultValue) {
             $customField->default_value = $request->defaultValue;
diff --git a/resources/views/admin/customFields/newForm.blade.php b/resources/views/admin/customFields/newForm.blade.php
index bff2055e..db5ff09a 100644
--- a/resources/views/admin/customFields/newForm.blade.php
+++ b/resources/views/admin/customFields/newForm.blade.php
@@ -46,7 +46,7 @@
             <label>
                 @lang('admin/customFields.resource')
 
-                <select name="type">
+                <select name="resource">
                     @foreach($resources as $resource => $translation)
                         <option value="{{$resource}}"@if(old('resource') == $resource) selected @endif>@lang($translation)</option>
                     @endforeach