cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Page_Issue' into development

Browse Source
This commit is contained in:
RaffiMohammed
2023-10-26 13:31:43 +05:30
parent 180df47b61 4952d57368
commit 3237bf8181
16 changed files with 735 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Agent/kb/ArticleController.php
View File

@@ -46,7 +46,7 @@ class ArticleController extends Controller
// checking authentication
$this->middleware('auth');
// checking roles
$this->middleware('roles');
$this->middleware('role.agent');
SettingsController::language();
}

6
app/Http/Controllers/Agent/kb/CategoryController.php
View File

@@ -40,7 +40,7 @@ class CategoryController extends Controller
// checking authentication
$this->middleware('auth');
// checking roles
$this->middleware('roles');
$this->middleware('role.agent');
SettingsController::language();
}
@@ -150,9 +150,9 @@ class CategoryController extends Controller
try {
$category->fill($request->input())->save();
return Redirect::back()->with('success', Lang::get('lang.category_inserted_successfully'));
return redirect('category')->with('success', Lang::get('lang.category_inserted_successfully'));
} catch (Exception $e) {
return Redirect::back()->with('fails', Lang::get('lang.category_not_inserted').'<li>'.$e->getMessage().'</li>');
return redirect('category')->with('fails', Lang::get('lang.category_not_inserted').'<li>'.$e->getMessage().'</li>');
}
}

8
app/Http/Controllers/Agent/kb/PageController.php
View File

@@ -38,7 +38,7 @@ class PageController extends Controller
// checking authentication
$this->middleware('auth');
// checking roles
$this->middleware('roles');
$this->middleware('role.agent');
$this->page = $page;
SettingsController::language();
}
@@ -86,7 +86,7 @@ class PageController extends Controller
/* add column Actions */
/* there are action buttons and modal popup to delete a data column */
->addColumn('Actions', function ($model) {
return '<span data-toggle="modal" data-target="#deletepage'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=page/'.$model->slug.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=pages/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
return '<span data-toggle="modal" data-target="#deletepage'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=page/'.$model->id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=pages/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
<div class="modal fade" id="deletepage'.$model->id.'">
<div class="modal-dialog">
<div class="modal-content">
@@ -150,7 +150,7 @@ class PageController extends Controller
public function edit($slug)
{
try {
$page = $this->page->where('slug', $slug)->first();
$page = $this->page->where('id', $slug)->first();
return view('themes.default1.agent.kb.pages.edit', compact('page'));
} catch (Exception $e) {
@@ -169,7 +169,7 @@ class PageController extends Controller
public function update($slug, PageRequest $request)
{
// get pages with respect to slug
$pages = $this->page->where('slug', $slug)->first();
$pages = $this->page->where('id', $slug)->first();
$sl = $request->input('name');
$slug = Str::slug($sl, '-');

2
app/Http/Controllers/Agent/kb/SettingsController.php
View File

@@ -42,7 +42,7 @@ class SettingsController extends Controller
// checking authentication
$this->middleware('auth');
// checking roles
$this->middleware('roles');
$this->middleware('role.agent');
$this->language();
}

15
app/Http/Controllers/Client/kb/UserController.php
View File

@@ -124,7 +124,7 @@ class UserController extends Controller
if ($arti) {
return view('themes.default1.client.kb.article-list.show', compact('arti'));
} else {
return redirect('404');
return Redirect::back()->with('fails', Lang::get('lang.sorry_not_processed'));
}
}
@@ -150,7 +150,6 @@ class UserController extends Controller
if (Config::get('database.install') == '%0%') {
return redirect('step1');
} else {
//$categorys = $category->get();
$categorys = $category->get();
// $categorys->setPath('home');
/* direct to view with $article_id */
@@ -235,7 +234,6 @@ class UserController extends Controller
{
$request->validate([
'comment' => 'required',
]);
$article = $article->where('slug', $slug)->first();
@@ -265,7 +263,16 @@ class UserController extends Controller
public function getPage($name, Page $page)
{
$page = $page->where('slug', $name)->first();
$page = $page->where('slug', $name);
if (!Auth::check() || \Auth::user()->role == 'user') {
$page = $page
->where(['status' => 1, 'visibility'=>1])
->first();
} else {
$page = $page->where('status', 1)->first();
}
if ($page) {
return view('themes.default1.client.kb.article-list.pages', compact('page'));
} else {

3
app/Http/Requests/kb/ArticleRequest.php
View File

@@ -24,8 +24,7 @@ class ArticleRequest extends Request
public function rules()
{
return [
'name' => 'required',
//'slug' => 'required|unique:kb_article',
'name' => 'required|unique:kb_article',
'description' => 'required',
'category_id' => 'required',
];

9
app/Http/Requests/kb/ArticleUpdate.php
View File

@@ -23,11 +23,14 @@ class ArticleUpdate extends Request
*/
public function rules()
{
$id = $this->segments()[1];
//$id = $this->segments()[1];
$segments = $this->segments();
$id = isset($segments[1]) ? $segments[1] : null;
return [
'name' => 'required',
'slug' => 'required|unique:kb_article,slug,'.$id.',id',
'name' => 'required|unique:kb_article,name,'.$id,
'slug' => 'required|unique:kb_article,slug,'.$id,
'description' => 'required',
'category_id' => 'required',
];

5
app/Http/Requests/kb/PageRequest.php
View File

@@ -23,10 +23,11 @@ class PageRequest extends Request
*/
public function rules()
{
$slug = $this->segment(2);
$id = $this->segment(2);
return [
'name' => 'required|unique:kb_pages,slug,'.$slug,
'name' => 'required|unique:kb_pages,name,'.$id,
'description' => 'required',
];
}
}