chg: [Organisation] Moved model to use meta-field behavior instead of association

src/Model/Table/OrganisationsTable.php

@@ -33,14 +33,7 @@ class OrganisationsTable extends AppTable
                 'conditions' => ['owner_model' => 'organisation']
             ]
         );
-        $this->hasMany(
+        $this->addBehavior('MetaFields');
-            'MetaFields',
-            [
-                'dependent' => true,
-                'foreignKey' => 'parent_id',
-                'conditions' => ['MetaFields.scope' => 'organisation']
-            ]
-        );
         $this->setDisplayField('name');
     }
 

templates/Organisations/index.php

@@ -44,6 +44,7 @@ echo $this->element('genericElements/IndexTable/index_table', [
                 'name' => __('Name'),
                 'class' => 'short',
                 'data_path' => 'name',
+                'sort' => 'name',
             ],
             [
                 'name' => __('UUID'),
@@ -67,14 +68,17 @@ echo $this->element('genericElements/IndexTable/index_table', [
             [
                 'name' => __('Nationality'),
                 'data_path' => 'nationality',
+                'sort' => 'nationality',
             ],
             [
                 'name' => __('Sector'),
                 'data_path' => 'sector',
+                'sort' => 'sector',
             ],
             [
                 'name' => __('Type'),
                 'data_path' => 'type',
+                'sort' => 'type',
             ],
             [
                 'name' => __('Tags'),

templates/Organisations/view.php

@@ -48,8 +48,7 @@ echo $this->element(
                 'scope' => 'organisations'
             ]
         ],
-        'metaTemplates' => empty($metaFields) ? [] : $metaFields,
+        'combinedFieldsView' => false,
-        'combinedFieldsView' => true,
         'children' => []
     ]
 );

templates/element/flash/success.php

@@ -24,4 +24,4 @@ if (!isset($params['escape']) || $params['escape'] !== false) {
         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
         </button>
     </div>
-<?php endif; ?>
+<?php endif; ?>