TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.1' of http://git.digital-tps.tk/TPS/ORIENT into 1.1

This commit is contained in:
Kerim 2023-02-17 11:45:37 +05:00
parent fd1448175f 58b8caca8f
commit c51149dba6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/ahmadfatoni/apigenerator/controllers/api/postsController.php
View File

@ -36,11 +36,11 @@ class postsController extends Controller
'published' => true,
'select' => ['id','title','slug','published_at', 'more_photo','afisha_phone', 'afisha_address', 'afisha_phone_new', DB::raw("IF(featured_image<>'',concat('$path',featured_image),featured_image) as main_image")]
];
if(request()->has('featured')){
$filter['featured'] = true;
$filter['featured'] = true;
}
$data = $this->Post::with(['categories:id,name'])->listFrontEnd($filter);
if($data){
@ -59,7 +59,7 @@ class postsController extends Controller
if(!is_null($post)) {
$post->url = $this->pageUrl('post',['id'=>$post->id,'slug'=>$post->slug]);
$post->url = $this->pageUrl('new/newPost',['id'=>$post->id,'slug'=>$post->slug]);
$obj = Db::table('vdomah_blogviews_views')
->where('post_id', $post->getKey());

1
plugins/rainlab/blog/models/Post.php
View File

@ -494,7 +494,6 @@ class Post extends Model
if ($typePost !== null) {
$typePost = is_array($typePost) ? $typePost : [$typePost];
$query->whereIn('type_post', $typePost);
}

2
themes/modern2/layouts/new/master-inside.htm
View File

@ -119,7 +119,7 @@ default = 0
<script src="{{ 'assets/new/jquery.js'|theme}}"></script>
<script src="{{ 'assets/new/scripts/swiper/swiper-bundle.min.js'|theme}}"></script>
<script src="{{ 'assets/new/copy.js'|theme}}"></script>
<script src="{{ 'assets/new/copy.js'|theme}}"></script>
{% framework extras %}
{% scripts %}