Skip to content

Commit

Permalink
composer
Browse files Browse the repository at this point in the history
  • Loading branch information
veneliniliev committed Dec 9, 2016
1 parent 0be31e8 commit b313bbf
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function up() {
$table->string('meta_description')->nullable()->default(null);
$table->string('meta_keywords')->nullable()->default(null);
$table->string('slug');
$table->text('description')->nullable()->default(null);
$table->longText('description')->nullable()->default(null);
$table->string('locale')->index();

$table->unique([
Expand Down
5 changes: 0 additions & 5 deletions Forms/PageForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ public function buildForm() {
'checked' => @$this->model->show_media,
]);

$this->add('date', 'datetime_picker', [
'label' => 'date',
'value' => ''
]);

$this->add('position', 'choice', [
'label' => trans('pages::admin.position'),
'choices' => [
Expand Down
26 changes: 7 additions & 19 deletions Http/Controllers/Admin/PagesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,8 @@ public function create(FormBuilder $formBuilder) {
*/
public function store(Request $request) {
$page = new Pages();
$requestData = $request->all();
if ($page->validate($requestData)) {

$page->fill($requestData);
if ($page->validate($request->all())) {
$page->fill($request->all());
$page->save();

return \Redirect::route(Administration::routeName('pages.index'));
Expand Down Expand Up @@ -183,27 +181,17 @@ public function edit($id, FormBuilder $formBuilder) {
*/
public function update(Request $request, $id) {
$page = Pages::where('id', $id)->first();
$requestData = $request->all();
if ($page->validate($requestData)) {
$page->fill($requestData);
if (empty($request->visible)) {
$page->visible = '0';
} else {
$page->visible = '1';
}
if (empty($request->show_media)) {
$page->show_media = '0';
} else {
$page->show_media = '1';
}

if ($page->validate($request->all())) {
$page->fill($request->all());

$page->save();
return \Redirect::route(Administration::routeName('pages.index'));

} else {
$validation = $page->errors();
return \Redirect::route(Administration::routeName('pages.create'))
->withInput()
->withErrors($validation);
->withErrors($page->getValidationErrors());
}
}

Expand Down
16 changes: 4 additions & 12 deletions Models/PagesTranslation.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
namespace App\Modules\Pages\Models;

use Cviebrock\EloquentSluggable\Sluggable;
use Illuminate\Database\Eloquent\Model;
use ProVision\Administration\AdminModelTranslations;

class PagesTranslation extends Model {
class PagesTranslation extends AdminModelTranslations {

use Sluggable;

public $timestamps = false;

Expand All @@ -18,16 +20,6 @@ class PagesTranslation extends Model {
'slug'
];

public function customizeSlugEngine($engine) {
$engine->addRule('ъ', 'a');
$engine->addRule('щ', 'sht');
$engine->addRule('ь', 'y');
$engine->addRule('Ъ', 'A');
$engine->addRule('Щ', 'SHT');
return $engine;
}

use Sluggable;

/**
* Return the sluggable configuration array for this model.
Expand Down
21 changes: 20 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,34 @@
{
"version": "0.3.0",
"name": "provision/pages",
"description": "ProVision Administration Pages module",
"keywords": [
"provision",
"module",
"pages"
],
"license": "Apache License 2.0",
"authors": [
{
"name": "Venelin Iliev",
"homepage": "http://veneliniliev.com"
}
],
"support": {
"issues": "https://github.com/ProVisionBG/pages/issues",
"source": "https://github.com/ProVisionBG/pages"
},
"homepage": "http://provision.bg",
"type": "library",
"require": {
"provision/administration": "dev-master"
"provision/administration": "~0.3.0"
},
"config": {
"preferred-install": "dist"
},
"autoload": {
"psr-4": {
"App\\Modules\\Pages": "/"
}
}
}

0 comments on commit b313bbf

Please sign in to comment.