From 5604a095fc70916f38173dcbd2ff33bc1de92411 Mon Sep 17 00:00:00 2001 From: Jmeyering Date: Mon, 14 Jul 2014 02:38:52 +0000 Subject: [PATCH 1/4] fire events on template updates --- modules/cms/controllers/Index.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php index e14845c5d..21d67023b 100644 --- a/modules/cms/controllers/Index.php +++ b/modules/cms/controllers/Index.php @@ -1,6 +1,7 @@ fill($templateData); $template->save(); + Event::fire('cms.template.afterSave', [$type]); Flash::success(Lang::get('cms::lang.template.saved')); @@ -224,6 +226,7 @@ class Index extends Controller $error = $ex->getMessage(); } + Event::fire('cms.template.afterDelete', [$type]); return [ 'deleted' => $deleted, 'error' => $error, @@ -236,8 +239,10 @@ class Index extends Controller $this->validateRequestTheme(); $this->loadTemplate( - Request::input('templateType'), + Request::input('templateType'), trim(Request::input('templatePath')))->delete(); + + Event::fire('cms.template.afterDelete', [$type]); } public function onGetTemplateList() From e9c3474c92b10ea951613e5c51144c81c2992d54 Mon Sep 17 00:00:00 2001 From: Jmeyering Date: Mon, 14 Jul 2014 07:07:43 -0500 Subject: [PATCH 2/4] Fix Naming Updates to correct naming issue --- modules/cms/controllers/Index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php index 21d67023b..38bd1496b 100644 --- a/modules/cms/controllers/Index.php +++ b/modules/cms/controllers/Index.php @@ -158,7 +158,7 @@ class Index extends Controller $template->fill($templateData); $template->save(); - Event::fire('cms.template.afterSave', [$type]); + Event::fire('cms.template.save', [$type]); Flash::success(Lang::get('cms::lang.template.saved')); @@ -226,7 +226,7 @@ class Index extends Controller $error = $ex->getMessage(); } - Event::fire('cms.template.afterDelete', [$type]); + Event::fire('cms.template.delete', [$type]); return [ 'deleted' => $deleted, 'error' => $error, From 7d1fe7833fae287a9a657a105c6338c5ec6c29a8 Mon Sep 17 00:00:00 2001 From: Jmeyering Date: Mon, 14 Jul 2014 07:09:01 -0500 Subject: [PATCH 3/4] One More naming issue --- modules/cms/controllers/Index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php index 38bd1496b..af6c6748f 100644 --- a/modules/cms/controllers/Index.php +++ b/modules/cms/controllers/Index.php @@ -242,7 +242,7 @@ class Index extends Controller Request::input('templateType'), trim(Request::input('templatePath')))->delete(); - Event::fire('cms.template.afterDelete', [$type]); + Event::fire('cms.template.delete', [$type]); } public function onGetTemplateList() From 142c7f40ca92f425e3fab00319ed3fa9358fc472 Mon Sep 17 00:00:00 2001 From: Jmeyering Date: Mon, 14 Jul 2014 12:15:23 +0000 Subject: [PATCH 4/4] Also adding in local events as per developer documentation --- modules/cms/controllers/Index.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php index af6c6748f..405b63e6f 100644 --- a/modules/cms/controllers/Index.php +++ b/modules/cms/controllers/Index.php @@ -158,7 +158,8 @@ class Index extends Controller $template->fill($templateData); $template->save(); - Event::fire('cms.template.save', [$type]); + Event::fire('cms.template.save', [$this, $type]); + $this->fireEvent('cms.template.save', [$type]); Flash::success(Lang::get('cms::lang.template.saved')); @@ -226,7 +227,9 @@ class Index extends Controller $error = $ex->getMessage(); } - Event::fire('cms.template.delete', [$type]); + Event::fire('cms.template.delete', [$this, $type]); + $this->fireEvent('cms.template.delete', [$type]); + return [ 'deleted' => $deleted, 'error' => $error, @@ -242,7 +245,8 @@ class Index extends Controller Request::input('templateType'), trim(Request::input('templatePath')))->delete(); - Event::fire('cms.template.delete', [$type]); + Event::fire('cms.template.delete', [$this, $type]); + $this->fireEvent('cms.template.delete', [$type]); } public function onGetTemplateList()