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

update v1.0.7.9

Browse Source
This commit is contained in:
Sujit Prasad
2016-08-04 19:57:15 +05:30
parent f07afa8307
commit 2d8a592a4d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,11 +38,13 @@ class UserController extends Controller {
public function getArticle(Article $article, Category $category, Settings $settings) { public function getArticle(Article $article, Category $category, Settings $settings) {
$setting = $settings->first(); $setting = $settings->first();
$pagination = $setting->pagination; $pagination = $setting->pagination;
if (\Auth::user()->role == 'user' || !Auth::check()) { if (!Auth::check() || \Auth::user()->role == 'user') {
$article = $article->where('status', '1'); $article = $article->where('status', '1');
} }
$article = $article->where('type', '1'); $article = $article->where('type', '1');
$article = $article->orderBy('publish_time','desc');
$article = $article->paginate($pagination); $article = $article->paginate($pagination);
$article->setPath('article-list'); $article->setPath('article-list');
$categorys = $category->get(); $categorys = $category->get();
return view('themes.default1.client.kb.article-list.articles', compact('time', 'categorys', 'article')); return view('themes.default1.client.kb.article-list.articles', compact('time', 'categorys', 'article'));

1
resources/views/themes/default1/client/kb/article-list/categoryList.blade.php
View File

@@ -35,6 +35,7 @@ class = "active"
$article = App\Model\kb\Article::where('id', $id)->get(); $article = App\Model\kb\Article::where('id', $id)->get();
$article = $article->where('status', 1); $article = $article->where('status', 1);
$article = $article->where('type', 1); $article = $article->where('type', 1);
$article = $article->orderBy('publish_time','desc');
//dd($article); //dd($article);
?> ?>
@foreach($article as $arti) @foreach($article as $arti)