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).
This commit is contained in:
Michal Kváček
2016-01-26 23:26:48 +01:00
parent 89d08f52af
commit 811e0ba5b2
2 changed files with 5 additions and 5 deletions
@@ -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;
@@ -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