From 1da22d28d813517ea0e739d1f477490f0baea490 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 19 Jun 2020 00:42:42 +0200
Subject: [PATCH] chg: [templates] Individuals and Organisations updated

---
 app/templates/Individuals/add.php     |  3 ---
 app/templates/Individuals/view.php    |  2 +-
 app/templates/Organisations/add.php   |  4 ----
 app/templates/Organisations/index.php |  2 +-
 app/templates/Organisations/view.php  | 10 +++++-----
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/templates/Individuals/add.php b/app/templates/Individuals/add.php
index dbb2f17..111fdf2 100644
--- a/app/templates/Individuals/add.php
+++ b/app/templates/Individuals/add.php
@@ -1,10 +1,7 @@
 <?php
     $modelForForm = 'Individuals';
     echo $this->element('genericElements/Form/genericForm', array(
-        'form' => $this->Form,
         'data' => array(
-            'entity' => $individual,
-            'title' => __('Add new individual'),
             'description' => __('Individuals are natural persons. They are meant to describe the basic information about an individual that may or may not be a user of this community. Users in genral require an individual object to identify the person behind them - however, no user account is required to store information about an individual. Individuals can have affiliations to organisations and broods as well as cryptographic keys, using which their messages can be verified and which can be used to securely contact them.'),
             'model' => 'Organisations',
             'fields' => array(
diff --git a/app/templates/Individuals/view.php b/app/templates/Individuals/view.php
index 510c142..b2bc237 100644
--- a/app/templates/Individuals/view.php
+++ b/app/templates/Individuals/view.php
@@ -3,7 +3,7 @@ echo $this->element(
     '/genericElements/SingleViews/single_view',
     [
         'title' => __('Individual View'),
-        'data' => $individual,
+        'data' => $entity,
         'fields' => [
             [
                 'key' => __('ID'),
diff --git a/app/templates/Organisations/add.php b/app/templates/Organisations/add.php
index 203c9ce..77d4ca8 100644
--- a/app/templates/Organisations/add.php
+++ b/app/templates/Organisations/add.php
@@ -1,10 +1,6 @@
 <?php
-    $modelForForm = 'Organisations';
     echo $this->element('genericElements/Form/genericForm', array(
-        'form' => $this->Form,
         'data' => array(
-            'entity' => $organisation,
-            'title' => __('Add new organisation'),
             'description' => __('Organisations can be equivalent to legal entities or specific individual teams within such entities. Their purpose is to relate individuals to their affiliations and for release control of information using the Trust Circles.'),
             'model' => 'Organisations',
             'fields' => array(
diff --git a/app/templates/Organisations/index.php b/app/templates/Organisations/index.php
index 2644953..2957a09 100644
--- a/app/templates/Organisations/index.php
+++ b/app/templates/Organisations/index.php
@@ -36,7 +36,7 @@ echo $this->element('genericElements/IndexTable/index_table', [
                 'name' => __('Members'),
                 'data_path' => 'alignments',
                 'element' =>  'count_summary',
-                'url' => '/individuals/index/?organisation_id={{url_data}}',
+                'url' => '/individuals/index/?Organisations.id={{url_data}}',
                 'url_data_path' => 'id'
             ],
             [
diff --git a/app/templates/Organisations/view.php b/app/templates/Organisations/view.php
index d63655b..7ed0862 100644
--- a/app/templates/Organisations/view.php
+++ b/app/templates/Organisations/view.php
@@ -1,10 +1,10 @@
 <?php
 echo $this->element(
     '/genericElements/SingleViews/single_view',
-    array(
+    [
         'title' => __('Organisation View'),
-        'data' => $organisation,
-        'fields' => array(
+        'data' => $entity,
+        'fields' => [
             [
                 'key' => __('ID'),
                 'path' => 'id'
@@ -43,7 +43,7 @@ echo $this->element(
                 'path' => 'alignments',
                 'scope' => 'organisations'
             ]
-        ),
+        ],
         'children' => []
-    )
+    ]
 );