Merge branch '2.x-release/v2.0.3' into 2.x

Author: themodernpk

Http/Controllers/Backend/ContentTypesController.php

@@ -1,10 +1,11 @@
-<?php namespace VaahCms\Modules\cms\Http\Controllers\Backend;
+<?php namespace VaahCms\Modules\Cms\Http\Controllers\Backend;
 
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use VaahCms\Modules\Cms\Models\Content;
 use VaahCms\Modules\Cms\Models\FieldType;
-use VaahCms\Modules\cms\Models\ContentType;
+use VaahCms\Modules\Cms\Models\ContentType;
+use WebReinvent\VaahCms\Models\TaxonomyType;
 
 
 class ContentTypesController extends Controller
@@ -47,9 +48,21 @@ public function getAssets(Request $request)
                 $data['empty_item'][$column] = null;
             }
 
+            $data['empty_item']['content_statuses'] = [
+                'draft',
+                'published',
+                'protected',
+            ];
+
             $data['field_types'] = FieldType::select('id', 'name', 'slug', 'meta')
                 ->get();
 
+            $data['content_relations'] = vh_content_relations();
+
+            $data['taxonomy_types'] = TaxonomyType::whereNotNull('is_active')
+                ->whereNull('parent_id')->with(['children'])
+                ->select('id', 'name', 'slug')->get();
+
             $data['non_repeatable_fields'] = Content::getNonRepeatableFields();
 
             $data['actions'] = [];

Http/Controllers/Backend/ContentsController.php

@@ -237,7 +237,7 @@ public function deleteItem(Request $request,$content_slug,$id)
         }
     }
     //----------------------------------------------------------
-    public function itemAction(Request $request,$id,$action)
+    public function itemAction(Request $request,$content_type_slug,$id,$action)
     {
         try{
             return Content::itemAction($request,$id,$action);
@@ -254,6 +254,40 @@ public function itemAction(Request $request,$id,$action)
         }
     }
     //----------------------------------------------------------
+    public function getRelationsInTree(Request $request)
+    {
+        $input = $request->all();
+
+        $list = [];
+
+        $relation =  vh_content_relations_by_name($input['type']);
+
+        if(!isset($relation['display_column']) || !$relation['display_column']){
+            $relation['display_column'] = 'name';
+        }
+
+        $url = null;
+
+        if($relation && isset($relation['namespace'])){
+
+            $relation['filter_id'] = $input['filter_id'];
+
+            $list = Content::getListByVariables($relation);
+
+            if(isset($relation['add_url']) && $relation['add_url']){
+                $url = $relation['add_url'];
+            }
+        }
+
+
+        $response['success'] = true;
+        $response['data']['list'] = $list;
+        $response['data']['display_column'] = $relation['display_column'];
+        $response['data']['add_url'] = $url;
+
+        return $response;
+    }
+    //----------------------------------------------------------
 
 
 }

Libraries/CmsSeeder.php

@@ -267,13 +267,14 @@ public static function createSampleField($theme_slug, $file_path, $content_type_
 
         $content_type = ContentType::where('slug', $content_type_slug)
             ->with(['groups.fields.type'])
-            ->first()->toArray();
+            ->first();
 
         if(!$content_type)
         {
             return false;
         }
 
+        $content_type = $content_type->toArray();
 
         foreach($list as $item)
         {

Models/Content.php

@@ -364,15 +364,15 @@ public static function itemAction($request, $id, $type): array
     {
         switch($type)
         {
-            case 'activate':
+            case 'published':
                 self::where('id', $id)
                     ->withTrashed()
-                    ->update(['status' => 1]);
+                    ->update(['status' => 'published']);
                 break;
-            case 'deactivate':
+            case 'draft':
                 self::where('id', $id)
                     ->withTrashed()
-                    ->update(['status' => null]);
+                    ->update(['status' => 'draft']);
                 break;
             case 'trash':
                 self::find($id)->delete();

Models/ContentBase.php

@@ -1330,7 +1330,7 @@ public static function getListByVariables($var)
             $list->where($var['filter_by'],$var['filter_id']);
         }
 
-        $list = $list->get();
+        $list = $list->select('id','id as key', $var['display_column'].' as label')->get();
 
         return $list;
 

Models/ContentType.php

@@ -100,7 +100,7 @@ public function getContentStatusesAttribute($value)
         {
             return json_decode($value);
         }
-        return null;
+        return [];
     }
     //-------------------------------------------------
     public function setMetaAttribute($value)

Models/ContentTypeBase.php

@@ -99,7 +99,7 @@ public function getContentStatusesAttribute($value)
         {
             return json_decode($value);
         }
-        return null;
+        return [];
     }
     //-------------------------------------------------
     public function setMetaAttribute($value)

Models/FormGroup.php

@@ -224,7 +224,7 @@ public static function syncWithFormFields(FormGroup $group, $fields_array)
 
                         if($stored_field){
 
-                            if($stored_field->meta && isset($stored_field->meta->type)
+                            if(isset($field['id']) && $stored_field->meta && isset($stored_field->meta->type)
                                 && $field['meta']['type'] != $stored_field->meta->type){
                                 $content_form_fields = ContentFormField::with(['contentFormRelations'])
                                     ->where('vh_cms_form_field_id', $field['id'])->get();