better collection handlich in backend
This commit is contained in:
parent
324eacf061
commit
50bcae442e
24 changed files with 623 additions and 68 deletions
|
@ -92,13 +92,12 @@ class HomeController extends Controller
|
|||
/**
|
||||
* show page by $page_slug.
|
||||
*/
|
||||
public function showPage($slug)
|
||||
public function showPage($slug): View
|
||||
{
|
||||
// $result = $pages->findBySlug($slug);
|
||||
if (!is_null(Page::query()->wherePage_slug($slug)->firstOrFail())) {
|
||||
$result = Page::query()->wherePage_slug($slug)->firstOrFail();
|
||||
return view('frontend.pages.index')
|
||||
->withpage($result);
|
||||
if (!is_null(Page::query()->where('page_slug', $slug)->firstOrFail())) {
|
||||
$result = Page::query()->where('page_slug', $slug)->firstOrFail();
|
||||
return view('frontend.pages.index')->withpage($result);
|
||||
} else {
|
||||
throw new GeneralException(trans('exceptions.backend.access.pages.not_found'));
|
||||
}
|
||||
|
|
|
@ -5,6 +5,8 @@ use Illuminate\Http\Request;
|
|||
use App\Http\Requests;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Collection;
|
||||
use App\Models\CollectionRole;
|
||||
use App\Http\Requests\Collection\CollectionRequest;
|
||||
|
||||
class CollectionController extends Controller
|
||||
{
|
||||
|
@ -52,12 +54,17 @@ class CollectionController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param int $id
|
||||
* @param Collection $collection
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show($id)
|
||||
public function show(Collection $collection)
|
||||
{
|
||||
//
|
||||
$collection = Collection::findOrFail($collection->id);
|
||||
//get child collections
|
||||
$collections = $collection
|
||||
->children()
|
||||
->paginate(10);
|
||||
return view('settings.collection.collection', compact('collections'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -68,7 +75,9 @@ class CollectionController extends Controller
|
|||
*/
|
||||
public function edit($id)
|
||||
{
|
||||
//
|
||||
$collection = Collection::findOrFail($id);
|
||||
$collectionroles = CollectionRole::pluck('name', 'id');
|
||||
return view('settings.collection.edit', compact('collection', 'collectionroles'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -78,9 +87,20 @@ class CollectionController extends Controller
|
|||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, $id)
|
||||
public function update(CollectionRequest $request, $id)
|
||||
{
|
||||
//
|
||||
$collection = Collection::findOrFail($id);
|
||||
$input = $request->all();
|
||||
//$input = $request->except('licenses', 'titles');
|
||||
$collection->update($input);
|
||||
session()->flash('flash_message', 'You have updated the collection "' . $collection->name . '"!');
|
||||
if ($collection->parent()->exists()) {
|
||||
return redirect()->route('settings.collection.show', $collection->parent);
|
||||
} else {
|
||||
$test = $collection->collectionrole;
|
||||
return redirect()->route('settings.collectionrole.show', $collection->collectionrole);
|
||||
}
|
||||
//return redirect()->route('settings.collectionrole.index');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
148
app/Http/Controllers/Settings/CollectionRoleController.php
Normal file
148
app/Http/Controllers/Settings/CollectionRoleController.php
Normal file
|
@ -0,0 +1,148 @@
|
|||
<?php
|
||||
namespace App\Http\Controllers\Settings;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\CollectionRole;
|
||||
use App\Models\Collection;
|
||||
use Illuminate\View\View;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
|
||||
class CollectionRoleController extends Controller
|
||||
{
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
//$collections = Collection::take(10)->get();
|
||||
//$collections = Collection::get();
|
||||
$collectionroles = CollectionRole::query() //with('collections')
|
||||
->with(['collections' => function ($query) {
|
||||
$query->whereNull('parent_id');
|
||||
}])
|
||||
->get();
|
||||
return view('settings.collectionrole.index', compact('collectionroles'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function create()
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param CollectionRole $collectionrole
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(CollectionRole $collectionrole)
|
||||
{
|
||||
$collectionrole = CollectionRole::findOrFail($collectionrole->id);
|
||||
//$collections = Collection::query()
|
||||
$collections = $collectionrole
|
||||
->collections()
|
||||
->whereNull('parent_id')
|
||||
// ->where('role_id', '=', $id)
|
||||
->paginate(10);
|
||||
return view('settings.collectionrole.show', compact('collections'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit($id)
|
||||
{
|
||||
$collectionrole = CollectionRole::findOrFail($id);
|
||||
return view('settings.collectionrole.edit', compact('collectionrole'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param int $id
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(Request $request, $id): RedirectResponse
|
||||
{
|
||||
$project = CollectionRole::findOrFail($id);
|
||||
$input = $request->all();
|
||||
$project->update($input);
|
||||
session()->flash('flash_message', 'You have updated the collection role!');
|
||||
return redirect()->route('settings.collectionrole.index');
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function delete($id)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* deactivate author, submitter etc....
|
||||
*
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function hide($id): RedirectResponse
|
||||
{
|
||||
$collectionrole = CollectionRole::findOrFail($id);
|
||||
$collectionrole->update(['visible' => 0]);
|
||||
session()->flash(
|
||||
'flash_message',
|
||||
'Visibility of collection role "' . $collectionrole->name . '" has changed successfully.'
|
||||
);
|
||||
return redirect()->route('settings.collectionrole.index');
|
||||
}
|
||||
|
||||
/**
|
||||
* activatew author, submitter etc....
|
||||
*
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function up($id): RedirectResponse
|
||||
{
|
||||
// $dateNow = time();
|
||||
$collectionrole = CollectionRole::findOrFail($id);
|
||||
$collectionrole->update(['visible' => 1]);
|
||||
session()->flash(
|
||||
'flash_message',
|
||||
'Visibility of collection role "' . $collectionrole->name . '" has changed successfully.'
|
||||
);
|
||||
return redirect()->route('settings.collectionrole.index');
|
||||
}
|
||||
}
|
Loading…
Add table
editor.link_modal.header
Reference in a new issue