diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php index d5e1bfeee626..32d1289b5441 100644 --- a/app/Filters/QueryFilters.php +++ b/app/Filters/QueryFilters.php @@ -190,9 +190,7 @@ abstract class QueryFilters return $this->builder; } - $this->builder->where('client_id', $this->decodePrimaryKey($client_id)); - - return $this->builder; + return $this->builder->where('client_id', $this->decodePrimaryKey($client_id)); } diff --git a/app/Http/Controllers/DesignController.php b/app/Http/Controllers/DesignController.php index f2b440056b7d..e66e98f0324a 100644 --- a/app/Http/Controllers/DesignController.php +++ b/app/Http/Controllers/DesignController.php @@ -357,6 +357,57 @@ class DesignController extends BaseController $design->fill($request->all()); $design->save(); +/* + This is required as the base template does not know to inject the table elements +*/ + + $properties = ['includes','header','body','footer']; + + $d = $design->design; + + $old_header = ''; + $new_header = ' + + + + + + + + + + + + + + + +
+
 
+
'; + + $old_footer = '
+ +
+ + + +