diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php index b4f24f74a..bb08d2cd4 100755 --- a/app/Http/Controllers/LabelsController.php +++ b/app/Http/Controllers/LabelsController.php @@ -27,7 +27,7 @@ class LabelsController extends Controller public function show(string $labelName) { $labelName = str_replace('/', '\\', $labelName); - $template = Label::find($labelName);// + $template = Label::find($labelName); $exampleAsset = new Asset(); diff --git a/app/View/Label.php b/app/View/Label.php index d74d1b3e5..fd6b17255 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -37,7 +37,6 @@ class Label implements View { $settings = $this->data->get('settings'); $assets = $this->data->get('assets'); - dd($this->data); $offset = $this->data->get('offset'); $template = $this->data->get('template'); diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 814768d60..a6edd2915 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -235,7 +235,7 @@ {{ Form::hidden('label2_fields', old('label2_fields', $setting->label2_fields)) }} @endif - @if ($setting->label2_enable) + @if ($setting->label2_enable && ($setting->label2_template != 'DefaultLabel')) {{ Form::hidden('labels_per_page', old('labels_per_page', $setting->labels_per_page)) }} {{ Form::hidden('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize)) }}