мелкие правки + возможность получать записи

типов контента по списку id
instantsoft · Sep 4, 2017 · e88a085 · e88a085
1 parent d451795
commit e88a085
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 7 deletions.
diff --git a/manifest.en.ini b/manifest.en.ini
@@ -1,12 +1,13 @@
 [info]
 title = "InstantCMS JSON API"
 image = "icon.png"
+addon_id = "600"
 
 [version]
 major = "2"
 minor = "0"
 build = "0"
-date  = "20170505"
+date  = "20170905"
 
 [depends]
 core = "2.5.0"

diff --git a/manifest.ru.ini b/manifest.ru.ini
@@ -1,12 +1,13 @@
 [info]
 title = "InstantCMS JSON API"
 image = "icon.png"
+addon_id = "600"
 
 [version]
 major = "2"
 minor = "0"
 build = "0"
-date  = "20170505"
+date  = "20170905"
 
 [depends]
 core = "2.5.0"

diff --git a/package/system/controllers/api/actions/method.php b/package/system/controllers/api/actions/method.php
@@ -252,7 +252,7 @@ private function validateMethodParams() {
 
         $errors = array();
 
-        // фалидация аналогична валидации форм
+        // валидация аналогична валидации форм
         foreach ($this->method_action->request_params as $param_name => $rules) {
 
             $value = $this->request->get($param_name, null);

diff --git a/package/system/controllers/api/api_actions/api_content_get.php b/package/system/controllers/api/api_actions/api_content_get.php
@@ -64,6 +64,12 @@ class actionContentApiContentGet extends cmsAction {
             'rules'   => array(
                 array('digits')
             )
+        ),
+        'ids' => array(
+            'default' => 0,
+            'rules'   => array(
+                array('regexp', '/^([0-9,]+)$/i')
+            )
         )
     );
 
@@ -109,7 +115,7 @@ public function validateApiRequest($ctype_name=null) {
         $user_id = $this->request->get('user_id');
         if($user_id){
 
-            $this->user = $this->model->$this->getItemById('{users}', $user_id);
+            $this->user = $this->model->getItemById('{users}', $user_id);
             if (!$this->user){
                 return array('error_msg' => LANG_API_ERROR100);
             }
@@ -131,7 +137,7 @@ public function validateApiRequest($ctype_name=null) {
         $group_id = $this->request->get('group_id');
         if($group_id){
 
-            $this->group = $this->model->$this->getItemById('content_folders', $group_id);
+            $this->group = $this->model->getItemById('groups', $group_id);
             if (!$this->group){
                 return array('error_msg' => LANG_API_ERROR100);
             }
@@ -166,6 +172,19 @@ public function run($ctype_name){
         // категории выключены, а передали категорию
         if (empty($this->ctype['is_cats']) && $this->cat['id'] > 1) { return; }
 
+        // если нужен список по id
+        $ids = $this->request->get('ids');
+        if($ids){
+
+            $ids = explode(',', $ids);
+            $ids = array_filter($ids);
+
+            if($ids){
+                $this->model->filterIn('id', $ids);
+            }
+
+        }
+
         // если передан набор, фильтруем по нему
         if($this->dataset){
             $this->model->applyDatasetFilters($this->dataset);

diff --git a/package/system/controllers/api/api_actions/api_content_get_categories.php b/package/system/controllers/api/api_actions/api_content_get_categories.php
@@ -78,15 +78,21 @@ public function run($ctype_name){
             return;
         }
 
+        $categories = array();
+
         $cat_ids = $this->request->get('cat_ids');
         if($cat_ids){
 
             $cat_ids = explode(',', $cat_ids);
             $cat_ids = array_filter($cat_ids);
 
-            $this->model->filterIn('id', $cat_ids);
+            if($cat_ids){
+
+                $this->model->filterIn('id', $cat_ids);
 
-            $categories = $this->model->get($this->model->table_prefix.$ctype_name.'_cats');
+                $categories = $this->model->get($this->model->table_prefix.$ctype_name.'_cats');
+
+            }
 
         } else {