minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: make possible values work as intended

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/CreateNewCustomField.php
+4 -4
View File
@@ -24,8 +24,7 @@ class CreateNewCustomField extends Controller
{ {
$customField = new CustomField(); $customField = new CustomField();
// @todo add support for determination of resource for custom field (module, user, ...) // set mandatory fields
// @todo add possible values
$customField->name = $request->name; $customField->name = $request->name;
$customField->type_id = $request->type; $customField->type_id = $request->type;
@@ -38,8 +37,9 @@ class CreateNewCustomField extends Controller
$customField->description = $request->description; $customField->description = $request->description;
} }
if ($request->possibleValues) if ($request->possibleValues) {
$customField->possible_values = $request->possibleValues; $customField->possible_values = trim(preg_replace('~[\r\n]+~', '|', $request->possibleValues));
}
if ($request->defaultValue) { if ($request->defaultValue) {
$customField->default_value = $request->defaultValue; $customField->default_value = $request->defaultValue;
resources/views/admin/customFields/newForm.blade.php
+1 -1
View File
@@ -46,7 +46,7 @@
<label> <label>
@lang('admin/customFields.resource') @lang('admin/customFields.resource')
<select name="type"> <select name="resource">
@foreach($resources as $resource => $translation) @foreach($resources as $resource => $translation)
<option value="{{$resource}}"@if(old('resource') == $resource) selected @endif>@lang($translation)</option> <option value="{{$resource}}"@if(old('resource') == $resource) selected @endif>@lang($translation)</option>
@endforeach @endforeach