diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 77f0be83c7..fa1ea85e93 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -751,7 +751,6 @@ class SettingsController extends Controller return view('settings.labels') ->with('setting', Setting::getSettings()) ->with('is_gd_installed', $is_gd_installed) - ->with('template', LabelModel::find(Setting::getSettings()->label2_template)) ->with('customFields', CustomField::where('field_encrypted', '=', 0)->get()); } diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index fdc6313bd2..d890c2a454 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -326,7 +326,7 @@ type="number" id="label2_empty_row_count" min="0" - max="{{ $template->getSupportFields() }}" + max="5" value="{{ old('label2_empty_row_count', $setting->label2_empty_row_count) }}" > {!! $errors->first('label2_empty_row_count', '') !!}