From 20cc8cd753c0f2dbe94d235b5069f683e9823d28 Mon Sep 17 00:00:00 2001
From: naomi <naomi@happycatsin.space>
Date: Sat, 20 Feb 2021 15:09:58 +0000
Subject: [PATCH] removed EVA stuff from template, plus misc

---
 ...ck.exposedformequal_opps_recordspage_1.yml | 28 +++++++++++++++++++
 modules/opencase_cases/oc_case.page.inc       |  3 --
 .../templates/oc_case.html.twig               |  5 ----
 .../opencase_entities/src/Entity/OCEvent.php  | 13 +--------
 opencase.module                               |  1 +
 5 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 config/install/block.block.exposedformequal_opps_recordspage_1.yml

diff --git a/config/install/block.block.exposedformequal_opps_recordspage_1.yml b/config/install/block.block.exposedformequal_opps_recordspage_1.yml
new file mode 100644
index 0000000..311c446
--- /dev/null
+++ b/config/install/block.block.exposedformequal_opps_recordspage_1.yml
@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.equal_opps_records
+  module:
+    - system
+    - views
+  theme:
+    - bartik
+id: exposedformequal_opps_recordspage_1
+theme: bartik
+region: content
+weight: 0
+provider: null
+plugin: 'views_exposed_filter_block:equal_opps_records-page_1'
+settings:
+  id: 'views_exposed_filter_block:equal_opps_records-page_1'
+  label: ''
+  provider: views
+  label_display: visible
+  views_label: 'Search by (whole) first or last name.'
+visibility:
+  request_path:
+    id: request_path
+    pages: /equal-opps-records
+    negate: false
+    context_mapping: {  }
diff --git a/modules/opencase_cases/oc_case.page.inc b/modules/opencase_cases/oc_case.page.inc
index a64da0e..6de9601 100644
--- a/modules/opencase_cases/oc_case.page.inc
+++ b/modules/opencase_cases/oc_case.page.inc
@@ -23,15 +23,12 @@ function template_preprocess_oc_case(array &$variables) {
   // Separate the fields into two sections to be displayed in two columns.
   // Remove the name (title) field as this is displayed anyway.
   $variables['id'] = $variables['elements']['#oc_case']->get('id')[0]->get('value')->getValue();
-  $variables['eva_fields'] = array(); // if the installation has any "EVA" (embedded view) fields this should catch them.
   $variables['base_fields'] = array();
   $variables['other_fields'] = array();
   foreach (Element::children($variables['elements']) as $key) {
     $variables['content'][$key] = $variables['elements'][$key];
     if (in_array($key, ['created', 'changed', 'files', 'actors_involved', 'status', 'user_id'])) {
       $variables['base_fields'][$key] = $variables['elements'][$key];
-    } else if (strpos($key, "entity_view") !== false) {
-      $variables['eva_fields'][$key] = $variables['elements'][$key];
     } else {
       $variables['other_fields'][$key] = $variables['elements'][$key];
       unset($variables['other_fields']['name']);
diff --git a/modules/opencase_cases/templates/oc_case.html.twig b/modules/opencase_cases/templates/oc_case.html.twig
index 4704e96..50376f8 100644
--- a/modules/opencase_cases/templates/oc_case.html.twig
+++ b/modules/opencase_cases/templates/oc_case.html.twig
@@ -29,10 +29,5 @@
         {{ field }}
       {% endfor %}
     </div>
-    <div class="eva_fields">
-      {% for field in eva_fields %}
-        {{ field }}
-      {% endfor %}
-    </div>
   </div>
 </div>
diff --git a/modules/opencase_entities/src/Entity/OCEvent.php b/modules/opencase_entities/src/Entity/OCEvent.php
index fae714b..10e8f69 100644
--- a/modules/opencase_entities/src/Entity/OCEvent.php
+++ b/modules/opencase_entities/src/Entity/OCEvent.php
@@ -149,13 +149,7 @@ class OCEvent extends ContentEntityBase implements OCEventInterface {
       ->setDescription(t('The user ID of author of the Event entity.'))
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'user')
-      ->setSetting('handler', 'default')
-      ->setTranslatable(TRUE)
-      ->setDisplayOptions('view', [
-        'label' => 'inline',
-        'type' => 'author',
-        'weight' => -4,
-      ]);
+      ->setSetting('handler', 'default');
 
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
@@ -165,11 +159,6 @@ class OCEvent extends ContentEntityBase implements OCEventInterface {
         'text_processing' => 0,
       ])
       ->setDefaultValue('')
-      ->setDisplayOptions('view', [
-        'label' => 'above',
-        'type' => 'string',
-        'weight' => -4,
-      ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -4,
diff --git a/opencase.module b/opencase.module
index 3a556a3..f5e59da 100644
--- a/opencase.module
+++ b/opencase.module
@@ -90,6 +90,7 @@ function opencase_uninstall() {
     'system.menu.opencase',
     'views.view.contact_details_changes',
     'views.view.equal_opps_records',
+    'block.block.exposedformequal_opps_recordspage_1',  
   ];
   foreach($configs as $config) {
     Drupal::configFactory()->getEditable($config)->delete();