From fbf5cbbb67f52e1fe781d178370d314f17ef9ec8 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Mon, 29 Sep 2014 12:19:19 +1000
Subject: [PATCH] Moved `ViewMaker` trait to live under system, it can be
 useful for Models too.

---
 CHANGELOG.md                                     | 3 +++
 modules/backend/classes/Controller.php           | 2 +-
 modules/backend/classes/ControllerBehavior.php   | 2 +-
 modules/backend/classes/WidgetBase.php           | 2 +-
 modules/{backend => system}/traits/ViewMaker.php | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
 rename modules/{backend => system}/traits/ViewMaker.php (99%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b185fd81..e609918af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+* **Build 15x** (2014-09-xx)
+  - Moved `ViewMaker` trait to live under system, it can be useful for Models too.
+
 * **Build 149** (2014-09-29)
   - Added new `hint` form field type (see Backend > Forms docs).
   - Added new `containerAttributes` property to form fields (see Backend > Forms docs).
diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index b4dcd6b8a..7d9bc117a 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -33,7 +33,7 @@ class Controller extends Extendable
 {
     use \System\Traits\AssetMaker;
     use \System\Traits\ConfigMaker;
-    use \Backend\Traits\ViewMaker;
+    use \System\Traits\ViewMaker;
     use \Backend\Traits\WidgetMaker;
     use \October\Rain\Support\Traits\Emitter;
 
diff --git a/modules/backend/classes/ControllerBehavior.php b/modules/backend/classes/ControllerBehavior.php
index 6d0fc4ed3..9727add37 100644
--- a/modules/backend/classes/ControllerBehavior.php
+++ b/modules/backend/classes/ControllerBehavior.php
@@ -4,7 +4,7 @@ use Str;
 use Lang;
 use System\Classes\ApplicationException;
 use October\Rain\Extension\ExtensionBase;
-use Backend\Traits\ViewMaker;
+use System\Traits\ViewMaker;
 
 /**
  * Controller Behavior base class
diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php
index 3c05e776a..0c14e3b99 100644
--- a/modules/backend/classes/WidgetBase.php
+++ b/modules/backend/classes/WidgetBase.php
@@ -16,7 +16,7 @@ abstract class WidgetBase
 
     use \System\Traits\AssetMaker;
     use \System\Traits\ConfigMaker;
-    use \Backend\Traits\ViewMaker;
+    use \System\Traits\ViewMaker;
     use \Backend\Traits\WidgetMaker;
     use \October\Rain\Support\Traits\Emitter;
 
diff --git a/modules/backend/traits/ViewMaker.php b/modules/system/traits/ViewMaker.php
similarity index 99%
rename from modules/backend/traits/ViewMaker.php
rename to modules/system/traits/ViewMaker.php
index 8bfa68ec1..012d0c8ed 100644
--- a/modules/backend/traits/ViewMaker.php
+++ b/modules/system/traits/ViewMaker.php
@@ -1,4 +1,4 @@
-<?php namespace Backend\Traits;
+<?php namespace System\Traits;
 
 use Str;
 use File;