From cfb2db17b913fa3a638dd6668461c512e805f1b2 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 13 Feb 2018 12:32:53 +0200 Subject: [PATCH] Proposals --- .../Controllers/ProposalTemplateController.php | 1 + resources/views/proposals/edit.blade.php | 8 +++++--- .../views/proposals/templates/edit.blade.php | 16 +++++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/ProposalTemplateController.php b/app/Http/Controllers/ProposalTemplateController.php index 5cdaca76ae21..846466e4a110 100644 --- a/app/Http/Controllers/ProposalTemplateController.php +++ b/app/Http/Controllers/ProposalTemplateController.php @@ -66,6 +66,7 @@ class ProposalTemplateController extends BaseController $customTemplates = ProposalTemplate::scope()->orderBy('name')->get(); $defaultTemplates = ProposalTemplate::whereNull('account_id')->orderBy('public_id')->get(); + $options = []; $customLabel = trans('texts.custom'); $defaultLabel = trans('texts.default'); diff --git a/resources/views/proposals/edit.blade.php b/resources/views/proposals/edit.blade.php index 276222d3483f..21d91f8dbf3e 100644 --- a/resources/views/proposals/edit.blade.php +++ b/resources/views/proposals/edit.blade.php @@ -59,9 +59,11 @@ ->appendIcon(Icon::create('remove-circle')) ->asLinkTo(HTMLUtils::previousUrl('/proposals')) !!} - {!! Button::primary(trans('texts.download')) - ->withAttributes(['onclick' => 'onDownloadClick()']) - ->appendIcon(Icon::create('download-alt')) !!} + @if ($proposal) + {!! Button::primary(trans('texts.download')) + ->withAttributes(['onclick' => 'onDownloadClick()']) + ->appendIcon(Icon::create('download-alt')) !!} + @endif {!! Button::success(trans("texts.save")) ->withAttributes(['id' => 'saveButton']) diff --git a/resources/views/proposals/templates/edit.blade.php b/resources/views/proposals/templates/edit.blade.php index df10a0171934..bd44a9c3de6d 100644 --- a/resources/views/proposals/templates/edit.blade.php +++ b/resources/views/proposals/templates/edit.blade.php @@ -46,13 +46,15 @@
- {!! Former::select() - ->style('display:inline;width:170px;background-color:white !important') - ->placeholder(trans('texts.load_template')) - ->onchange('onTemplateSelectChange()') - ->addClass('template-select') - ->options($templateOptions) - ->raw() !!} + @if (count($templateOptions)) + {!! Former::select() + ->style('display:inline;width:170px;background-color:white !important') + ->placeholder(trans('texts.load_template')) + ->onchange('onTemplateSelectChange()') + ->addClass('template-select') + ->options($templateOptions) + ->raw() !!} + @endif @include('proposals.grapesjs_help')