Merge branch 'module_blog' into dev

app/Http/Controllers/Admin/ContentOverview.php

@@ -32,11 +32,16 @@ class ContentOverview extends Controller
     {
         $moduleFilterHandler = false;
         $perPage = Input::get('perPage') ? Input::get('perPage') : 20;
+        $pageHeading = 'admin/contents.overview';
 
         // does user want to filter results using module?
         if (is_numeric($moduleId)) {
             $module = Module::findOrFail($moduleId);
             $moduleFilterHandler = $module->handler;
+
+            if (is_callable([$module->handler, 'getOverviewTitle'])) {
+                $pageHeading = call_user_func([$module->handler, 'getOverviewTitle']);
+            }
         }
 
         // get pages for overview
@@ -47,10 +52,11 @@ class ContentOverview extends Controller
         $homepage = $this->content->getHomepage();
 
         return view('admin.content.overview', [
-            'pages'    => $pages,
-            'homepage' => $homepage,
-            'statuses' => ContentStatuses::getWithTranslations(),
-            'module' => isset($module) ? $module : null
+            'pages'       => $pages,
+            'homepage'    => $homepage,
+            'pageHeading' => $pageHeading,
+            'statuses'    => ContentStatuses::getWithTranslations(),
+            'module'      => isset($module) ? $module : null
         ]);
     }
 }

app/Http/Controllers/Admin/CreateNewContent.php

@@ -116,7 +116,9 @@ class CreateNewContent extends Controller
         }
 
         // upload file - if provided
-        $page->uploadTitlePhoto($request);
+        $file = $page->uploadTitlePhoto($request);
+
+        $page->title_photo = $file ? $file['filename'] : null;
 
         // save module-specific stuff
         call_user_func_array([$module->handler, 'createNew'], [&$page, $request]);

app/Http/Controllers/Admin/EditContent.php

@@ -118,12 +118,14 @@ class EditContent extends Controller
                 ->with('error', trans('admin/contents.invalidPage'));
         }
 
+        // upload file - if provided
+        $file = $page->uploadTitlePhoto($request);
+
         $request->url = Str::slug($request->url);
         $request->parentPage = $request->parentPage ? $request->parentPage : null;
-        $request->titlePhotoFilename = $page->title_photo;
 
-        // upload file - if provided
-        $page->uploadTitlePhoto($request);
+        $request->titlePhotoFilename = $file ? $file['filename'] : null;
+
 
         // array of fields in database and fields from request
         $fields = [
@@ -142,7 +144,8 @@ class EditContent extends Controller
         ];
 
         // save new values with history
-        $data = self::getFields($request, $fields);
+        $data = self::getFields($request, array_values($fields));
+
         list($revision, $changedColumns) = $page->updateWithHistory($fields, $data);
 
         $changedColumns += call_user_func_array([$page->module_handler, 'edit'], [&$page, $request, $revision]);

app/Http/Controllers/Visitor/ContentPage.php

@@ -53,6 +53,9 @@ class ContentPage extends Controller
         // add one new "view" for page
         $page->view();
 
+        // decode module settings
+        $page->module_settings = json_decode($page->module_settings);
+
         // get handler
         $handler = new $page->module_handler;