From 3a32d03bea7096e6a0939dd9992db134c61614f7 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 12 Feb 2018 15:03:12 +0200 Subject: [PATCH] Proposals --- app/Http/Controllers/ProposalController.php | 1 + app/Http/Controllers/ProposalSnippetController.php | 1 + .../Controllers/ProposalTemplateController.php | 1 + app/Models/ProposalSnippet.php | 2 +- app/Models/ProposalTemplate.php | 2 +- app/Ninja/Presenters/ProposalSnippetPresenter.php | 14 ++++++++++++++ app/Ninja/Presenters/ProposalTemplatePresenter.php | 14 ++++++++++++++ 7 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 app/Ninja/Presenters/ProposalSnippetPresenter.php create mode 100644 app/Ninja/Presenters/ProposalTemplatePresenter.php diff --git a/app/Http/Controllers/ProposalController.php b/app/Http/Controllers/ProposalController.php index 7d06ac274bc0..5a8a93125705 100644 --- a/app/Http/Controllers/ProposalController.php +++ b/app/Http/Controllers/ProposalController.php @@ -84,6 +84,7 @@ class ProposalController extends BaseController $data = array_merge($this->getViewmodel(), [ 'proposal' => $proposal, + 'entity' => $proposal, 'method' => 'PUT', 'url' => 'proposals/' . $proposal->public_id, 'title' => trans('texts.edit_proposal'), diff --git a/app/Http/Controllers/ProposalSnippetController.php b/app/Http/Controllers/ProposalSnippetController.php index 79238f804c01..c0bcd03c49e0 100644 --- a/app/Http/Controllers/ProposalSnippetController.php +++ b/app/Http/Controllers/ProposalSnippetController.php @@ -80,6 +80,7 @@ class ProposalSnippetController extends BaseController $data = [ 'account' => auth()->user()->account, 'snippet' => $proposalSnippet, + 'entity' => $proposalSnippet, 'method' => 'PUT', 'url' => 'proposals/snippets/' . $proposalSnippet->public_id, 'title' => trans('texts.edit_proposal_snippet'), diff --git a/app/Http/Controllers/ProposalTemplateController.php b/app/Http/Controllers/ProposalTemplateController.php index 40c05e0c9fda..5cdaca76ae21 100644 --- a/app/Http/Controllers/ProposalTemplateController.php +++ b/app/Http/Controllers/ProposalTemplateController.php @@ -117,6 +117,7 @@ class ProposalTemplateController extends BaseController $data = array_merge($this->getViewmodel(), [ 'template' => $template, + 'entity' => $clone ? false : $template, 'method' => $method, 'url' => $url, 'title' => trans('texts.edit_proposal_template'), diff --git a/app/Models/ProposalSnippet.php b/app/Models/ProposalSnippet.php index 4a51d06a9ce9..b53720db9f2f 100644 --- a/app/Models/ProposalSnippet.php +++ b/app/Models/ProposalSnippet.php @@ -33,7 +33,7 @@ class ProposalSnippet extends EntityModel /** * @var string */ - //protected $presenter = 'App\Ninja\Presenters\ProjectPresenter'; + protected $presenter = 'App\Ninja\Presenters\ProposalSnippetPresenter'; /** * @return mixed diff --git a/app/Models/ProposalTemplate.php b/app/Models/ProposalTemplate.php index 110d617f1815..1bd221ce95ba 100644 --- a/app/Models/ProposalTemplate.php +++ b/app/Models/ProposalTemplate.php @@ -31,7 +31,7 @@ class ProposalTemplate extends EntityModel /** * @var string */ - //protected $presenter = 'App\Ninja\Presenters\ProjectPresenter'; + protected $presenter = 'App\Ninja\Presenters\ProposalTemplatePresenter'; /** * @return mixed diff --git a/app/Ninja/Presenters/ProposalSnippetPresenter.php b/app/Ninja/Presenters/ProposalSnippetPresenter.php new file mode 100644 index 000000000000..fd94da49fe9a --- /dev/null +++ b/app/Ninja/Presenters/ProposalSnippetPresenter.php @@ -0,0 +1,14 @@ +