From 8e5a96c0d8f96df4d7b0aaa653641e22838726e2 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 3 Oct 2017 09:12:12 +0200
Subject: [PATCH] detailed UI hooks processing can be used in stable targets
 again now

---
 .../cartridges/zclassic/view/Forms.xtend         | 16 ++++++----------
 .../cartridges/zclassic/view/pages/Delete.xtend  | 16 ++++++----------
 .../cartridges/zclassic/view/pages/Display.xtend | 16 ++++++----------
 .../cartridges/zclassic/view/pages/View.xtend    | 16 ++++++----------
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/Forms.xtend b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/Forms.xtend
index b88dd9d97..d89068e34 100644
--- a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/Forms.xtend
+++ b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/Forms.xtend
@@ -340,16 +340,12 @@ class Forms {
 
     def private displayHooks(Entity it, Application app) '''
         {% set hookId = mode != 'create' ? «name.formatForDB».«primaryKey.name.formatForCode» : null %}
-        «IF application.targets('2.0-dev') || (application.targets('1.5-dev') && !application.targets('2.0'))»
-            {% set hooks = notifyDisplayHooks(eventName='«app.appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».form_edit', id=hookId, true) %}
-            {% if hooks is iterable and hooks|length > 0 %}
-                {% for area, hook in hooks %}
-                    <div class="z-displayhook" data-area="{{ area|e('html_attr') }}">{{ hook }}</div>
-                {% endfor %}
-            {% endif %}
-        «ELSE»
-            {{ notifyDisplayHooks(eventName='«app.appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».form_edit', id=hookId) }}
-        «ENDIF»
+        {% set hooks = notifyDisplayHooks(eventName='«app.appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».form_edit', id=hookId, true) %}
+        {% if hooks is iterable and hooks|length > 0 %}
+            {% for area, hook in hooks %}
+                <div class="z-displayhook" data-area="{{ area|e('html_attr') }}">{{ hook }}</div>
+            {% endfor %}
+        {% endif %}
     '''
 
     def private additionalInitScript(DerivedField it) {
diff --git a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Delete.xtend b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Delete.xtend
index 32ed4cf3c..3c2fc9019 100644
--- a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Delete.xtend
+++ b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Delete.xtend
@@ -85,15 +85,11 @@ class Delete {
     '''
 
     def private callDisplayHooks(Entity it, String appName) '''
-        «IF application.targets('2.0-dev') || (application.targets('1.5-dev') && !application.targets('2.0'))»
-            {% set hooks = notifyDisplayHooks(eventName='«appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».form_delete', id=«name.formatForCode».getKey(), true) %}
-            {% if hooks is iterable and hooks|length > 0 %}
-                {% for area, hook in hooks %}
-                    <div class="z-displayhook" data-area="{{ area|e('html_attr') }}">{{ hook }}</div>
-                {% endfor %}
-            {% endif %}
-        «ELSE»
-            {{ notifyDisplayHooks(eventName='«appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».form_delete', id=«name.formatForCode».getKey()) }}
-        «ENDIF»
+        {% set hooks = notifyDisplayHooks(eventName='«appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».form_delete', id=«name.formatForCode».getKey(), true) %}
+        {% if hooks is iterable and hooks|length > 0 %}
+            {% for area, hook in hooks %}
+                <div class="z-displayhook" data-area="{{ area|e('html_attr') }}">{{ hook }}</div>
+            {% endfor %}
+        {% endif %}
     '''
 }
diff --git a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Display.xtend b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Display.xtend
index 13660c562..c531eefb0 100644
--- a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Display.xtend
+++ b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Display.xtend
@@ -329,16 +329,12 @@ class Display {
             <div role="tabpanel" class="tab-pane fade" id="tabHooks" aria-labelledby="hooksTab">
                 <h3>{{ __('Hooks') }}</h3>
         «ENDIF»
-        «IF application.targets('2.0-dev') || (application.targets('1.5-dev') && !application.targets('2.0'))»
-            {% set hooks = notifyDisplayHooks(eventName='«appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».display_view', id=«name.formatForCode».getKey(), urlObject=currentUrlObject, true) %}
-            {% if hooks is iterable and hooks|length > 0 %}
-                {% for area, hook in hooks %}
-                    <div class="z-displayhook" data-area="{{ area|e('html_attr') }}">{{ hook }}</div>
-                {% endfor %}
-            {% endif %}
-        «ELSE»
-            {{ notifyDisplayHooks(eventName='«appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».display_view', id=«name.formatForCode».getKey(), urlObject=currentUrlObject) }}
-        «ENDIF»
+        {% set hooks = notifyDisplayHooks(eventName='«appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».display_view', id=«name.formatForCode».getKey(), urlObject=currentUrlObject, true) %}
+        {% if hooks is iterable and hooks|length > 0 %}
+            {% for area, hook in hooks %}
+                <div class="z-displayhook" data-area="{{ area|e('html_attr') }}">{{ hook }}</div>
+            {% endfor %}
+        {% endif %}
         «IF useGroupingTabs('display')»
             </div>
         «ENDIF»
diff --git a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/View.xtend b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/View.xtend
index 5646bcf93..16d041c6d 100644
--- a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/View.xtend
+++ b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/View.xtend
@@ -338,16 +338,12 @@ class View {
 
         {# here you can activate calling display hooks for the view page if you need it #}
         {# % if routeArea != 'admin' %}
-            «IF application.targets('2.0-dev') || (application.targets('1.5-dev') && !application.targets('2.0'))»
-                {% set hooks = notifyDisplayHooks(eventName='«appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».display_view', urlObject=currentUrlObject, true) %}
-                {% if hooks is iterable and hooks|length > 0 %}
-                    {% for area, hook in hooks %}
-                        <div class="z-displayhook" data-area="{{ area|e('html_attr') }}">{{ hook }}</div>
-                    {% endfor %}
-                {% endif %}
-            «ELSE»
-                {{ notifyDisplayHooks(eventName='«appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».display_view', urlObject=currentUrlObject) }}
-            «ENDIF»
+            {% set hooks = notifyDisplayHooks(eventName='«appName.formatForDB».ui_hooks.«nameMultiple.formatForDB».display_view', urlObject=currentUrlObject, true) %}
+            {% if hooks is iterable and hooks|length > 0 %}
+                {% for area, hook in hooks %}
+                    <div class="z-displayhook" data-area="{{ area|e('html_attr') }}">{{ hook }}</div>
+                {% endfor %}
+            {% endif %}
         {% endif % #}
     '''