minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FEATURE: more changes to article and article list

Browse Source
This commit is contained in:
Peter Hrdlica
2016-10-10 21:36:55 +02:00
parent 446e8352b5 190ca25b2a
commit 59226dbdc4
99 changed files with 17117 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/CurrentTemplate.php
+8 -2
View File
@@ -2,6 +2,9 @@
namespace App\Helpers;
use App\Models\Module;
use DebugBar\Bridge\MonologCollector;
use Illuminate\Database\QueryException;
use Monolog\Logger;
class CurrentTemplate
{
@@ -10,16 +13,19 @@ class CurrentTemplate
/**
* Getter for currently set template
*
* @return Module
* @throws \ErrorException
*/
public static function get()
{
if (!self::$initialized) {
try {
self::$template = Module::where('is_template', true)
->where('enabled', true)
->first();
} catch (QueryException $e) {
throw new \ErrorException('DB not migrated, please, do so!');
}
if (self::$template) {
self::$template->module_settings = json_decode(self::$template->module_settings);
}
app/Http/Requests/CreateNewContentRequest.php
+8 -8
View File
@@ -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',
];
}
}
app/Http/Requests/EditContentRequest.php
+7 -7
View File
@@ -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'
];
}
}