Merge pull request #460 from jjrom/develop

Typo in links

Author: jjrom

app/resto/core/RestoConstants.php

@@ -20,7 +20,7 @@ class RestoConstants
     // [IMPORTANT] Starting resto 7.x, default routes are defined in RestoRouter class
 
     // resto version
-    const VERSION = '9.0.0-RC22';
+    const VERSION = '9.0.0-RC23';
 
     /* ============================================================
      *              NEVER EVER TOUCH THESE VALUES

app/resto/core/dbfunctions/CatalogsFunctions.php

@@ -452,8 +452,8 @@ private function storeCatalog($catalog, $userid, $context, $collectionId, $featu
 
         $cleanLinks = $this->getCleanLinks($catalog, $userid, $context);
 
-        $insert = 'INSERT INTO ' . $this->dbDriver->targetSchema . '.catalog (id, title, description, level, counters, owner, links, visibility, rtype, created) SELECT $1,$2,$3,$4,$5,$6,$7,$8,$9,now() ON CONFLICT (id) DO NOTHING';
-        $this->dbDriver->pQuery($insert, array(
+        $insert = '(id, title, description, level, counters, owner, visibility, rtype, created) SELECT $1,$2,$3,$4,$5,$6,$7,$8,now()';
+        $values = array(
             $catalog['id'],
             $catalog['title'] ?? $catalog['id'],
             $catalog['description'] ?? null,
@@ -464,10 +464,16 @@ private function storeCatalog($catalog, $userid, $context, $collectionId, $featu
                 'collections' => array()
             ), JSON_UNESCAPED_SLASHES)),
             $catalog['owner'] ?? $userid,
-            json_encode($cleanLinks['links'], JSON_UNESCAPED_SLASHES),
             RestoConstants::GROUP_DEFAULT_ID,
             $catalog['rtype'] ?? null
-        ), 500, 'Cannot insert catalog ' . $catalog['id']);
+        );
+        if ( isset($cleanLinks['links']) ) {
+            $values[] = json_encode($cleanLinks['links'] ?? array(), JSON_UNESCAPED_SLASHES);
+            $insert = '(id, title, description, level, counters, owner, visibility, rtype, links, created) SELECT $1,$2,$3,$4,$5,$6,$7,$8,$9,now()';
+        }
+
+        $insert = 'INSERT INTO ' . $this->dbDriver->targetSchema . '.catalog (id, title, description, level, counters, owner, links, visibility, rtype, created) SELECT $1,$2,$3,$4,$5,$6,$7,$8,$9,now() ON CONFLICT (id) DO NOTHING';
+        $this->dbDriver->pQuery($insert, $values, 500, 'Cannot insert catalog ' . $catalog['id']);
 
         /*
          * Catalog id are like this

docs/COLLECTIONS_AND_CATALOGS.md

@@ -100,8 +100,11 @@ is to create an empty catalog then add its childs through the POST API
         curl -X PUT -d@examples/catalogs/dummyCatalog_update.json "http://admin:admin@localhost:5252/catalogs/dummyCatalog"
         
         # Use _force flag to force links update
+        curl -X PUT -d@examples/catalogs/dummyCatalog_update.json "http://admin:admin@localhost:5252/catalogs/dummyCatalog?_force=1"
 
-        
+### Update a catalog changing everything except links
+
+        # If the links property is not set, then existing links will not be affected
 
 ### Delete a catalog