Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop

src/Controller/Component/ACLComponent.php

@@ -110,7 +110,7 @@ class ACLComponent extends Component
             'batchAction' => ['perm_admin'],
             'broodTools' => ['perm_admin'],
             'connectionRequest' => ['perm_admin'],
-            'connectLocal' => ['perm_admin'],
+            // 'connectLocal' => ['perm_admin'],
             'delete' => ['perm_admin'],
             'edit' => ['perm_admin'],
             'exposedTools' => ['OR' => ['perm_admin', 'perm_sync']],

src/Controller/LocalToolsController.php

@@ -340,6 +340,7 @@ class LocalToolsController extends AppController
         }
     }
 
+/*
     public function connectLocal($local_tool_id)
     {
         $params = [
@@ -355,10 +356,8 @@ class LocalToolsController extends AppController
             $params['target_tool_id'] = $postParams['target_tool_id'];
             $result = $this->LocalTools->encodeLocalConnection($params);
             // Send message to remote inbox
-            debug($result);
         } else {
             $target_tools = $this->LocalTools->findConnectable($local_tool);
-            debug($target_tools);
             if (empty($target_tools)) {
                 throw new NotFoundException(__('No tools found to connect.'));
             }
@@ -369,4 +368,5 @@ class LocalToolsController extends AppController
             ]);
         }
     }
+*/
 }

src/Model/Entity/Outbox.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Model\Entity;
+
+use App\Model\Entity\AppModel;
+use Cake\ORM\Entity;
+
+class Outbox extends AppModel
+{
+    
+}

src/Model/Table/LocalToolsTable.php

@@ -289,6 +289,7 @@ class LocalToolsTable extends AppTable
         return $jsonReply;
     }
 
+/*
     public function findConnectable($local_tool): array
     {
         $connectors = $this->getInterconnectors($local_tool['connector']);
@@ -298,8 +299,8 @@ class LocalToolsTable extends AppTable
                 $validTargets[$connector['connects'][1]] = 1;
             }
         }
-
     }
+*/
 
     public function fetchConnection($id): object
     {

templates/Individuals/add.php

@@ -23,7 +23,8 @@
                 ),
                 array(
                     'field' => 'tag_list',
-                    'type' => 'tags'
+                    'type' => 'tags',
+                    'requirements' => $this->request->getParam('action') === 'edit'
                 ),
             ),
             'metaTemplates' => empty($metaTemplates) ? [] : $metaTemplates,

templates/LocalTools/connector_index.php

@@ -89,12 +89,14 @@ echo $this->element('genericElements/IndexTable/index_table', [
                 'url_params_data_paths' => ['id'],
                 'icon' => 'eye'
             ],
+            /*
             [
                 'open_modal' => '/localTools/connectLocal/[onclick_params_data_path]',
                 'modal_params_data_path' => 'id',
                 'reload_url' => sprintf('/localTools/connectorIndex/%s', h($connectorName)),
                 'icon' => 'plug'
             ],
+            */
             [
                 'open_modal' => '/localTools/edit/[onclick_params_data_path]',
                 'modal_params_data_path' => 'id',

templates/Organisations/add.php

@@ -17,7 +17,7 @@
                     'type' => 'uuid'
                 ),
                 array(
-                    'field' => 'URL'
+                    'field' => 'url'
                 ),
                 array(
                     'field' => 'nationality'