From 190ca25b2a90d4cf7c7395084f6747f7b52c7842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Mon, 10 Oct 2016 20:31:59 +0200
Subject: [PATCH] FIX: fix published_from and published_to fields

---
 app/Http/Requests/CreateNewContentRequest.php    | 16 ++++++++--------
 app/Http/Requests/EditContentRequest.php         | 14 +++++++-------
 .../content/formParts/publicationSetup.blade.php |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/Http/Requests/CreateNewContentRequest.php b/app/Http/Requests/CreateNewContentRequest.php
index df25858b..c488149c 100644
--- a/app/Http/Requests/CreateNewContentRequest.php
+++ b/app/Http/Requests/CreateNewContentRequest.php
@@ -12,14 +12,14 @@ class CreateNewContentRequest extends Request
     public function rules()
     {
         return [
-            'titlePhoto'     => 'image',
-            'title'          => 'required',
-            'url'            => 'required|unique:contents,url',
-            'status'         => 'required|in:draft,protected,public',
-            'title_photo'    => 'exists:files,id',
-            'parentPage'     => 'exists:contents,id',
-            'published_from' => 'date',
-            'published_to'   => 'date',
+            'titlePhoto'    => 'image',
+            'title'         => 'required',
+            'url'           => 'required|unique:contents,url',
+            'status'        => 'required|in:draft,protected,public',
+            'title_photo'   => 'exists:files,id',
+            'parentPage'    => 'exists:contents,id',
+            'publishedFrom' => 'date',
+            'publishedTo'   => 'date',
         ];
     }
 }
diff --git a/app/Http/Requests/EditContentRequest.php b/app/Http/Requests/EditContentRequest.php
index e04878e6..040fac90 100644
--- a/app/Http/Requests/EditContentRequest.php
+++ b/app/Http/Requests/EditContentRequest.php
@@ -18,13 +18,13 @@ class EditContentRequest extends Request
         $statuses = implode(',', $statuses);
 
         return [
-            'title'          => 'required',
-            'url'            => 'required|unique:contents,url,' . $this->id,
-            'published_from' => 'date',
-            'published_to'   => 'date',
-            'title_photo'    => 'exists:files,id',
-            'status'         => 'required|in:' . $statuses,
-            'parentPage'     => 'exists:contents,id'
+            'title'         => 'required',
+            'url'           => 'required|unique:contents,url,' . $this->id,
+            'publishedFrom' => 'date',
+            'publishedTo'   => 'date',
+            'title_photo'   => 'exists:files,id',
+            'status'        => 'required|in:' . $statuses,
+            'parentPage'    => 'exists:contents,id'
         ];
     }
 }
diff --git a/resources/views/admin/content/formParts/publicationSetup.blade.php b/resources/views/admin/content/formParts/publicationSetup.blade.php
index b19aa138..8664f708 100644
--- a/resources/views/admin/content/formParts/publicationSetup.blade.php
+++ b/resources/views/admin/content/formParts/publicationSetup.blade.php
@@ -4,7 +4,7 @@
             @lang('admin/contents.field_published_from')
         </label>
 
-            <input type="datetime" class="form-control" name="published_from" value="{{old('published_from', $page->published_from)}}"
+            <input type="datetime" class="form-control" name="publishedFrom" value="{{old('published_from', $page->published_from)}}"
                    placeholder="@lang('admin/contents.field_published_from')" />
 
         @include('admin.snippets.hasError', ['field' => 'published_from'])
@@ -15,7 +15,7 @@
             @lang('admin/contents.field_published_to')
         </label>
 
-            <input type="datetime" class="form-control" name="published_to" value="{{old('published_to', $page->published_to)}}"
+            <input type="datetime" class="form-control" name="publishedTo" value="{{old('published_to', $page->published_to)}}"
                    placeholder="@lang('admin/contents.field_published_to')" />
         @include('admin.snippets.hasError', ['field' => 'published_to'])
     </div>