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

plugins/ahmadfatoni/apigenerator/controllers/api/postsController.php

@@ -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());

plugins/rainlab/blog/models/Post.php

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

themes/modern2/layouts/new/master-inside.htm

@@ -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 %}