From 08c9dda1de346e21e851929ff8faf1f433f63945 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@hotmail.de>
Date: Thu, 11 May 2017 12:39:00 +0200
Subject: [PATCH] Improvements for plugin integration

---
 CHANGELOG                                     |  1 +
 .../static/templates/agenda/item-list.html    |  1 +
 openslides/core/static/css/app.css            |  5 +++
 openslides/core/static/js/core/base.js        | 41 +++++++++++++++----
 openslides/core/static/js/core/site.js        |  4 +-
 5 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 71453defb..e92081797 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -76,6 +76,7 @@ General:
 - Improved performance for PDF generation significantly (by upgrading
   to pdfmake 0.1.30) [#3278, #3285].
 - Bugfixes for PDF creation [#3227, #3251, #3279, #3286, #3346].
+- Improvements for plugin integration [#3330].
 
 
 Version 2.1.1 (2017-04-05)
diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index ae7cad92d..7ebb14b1b 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -335,6 +335,7 @@
                 </span>
               </div>
             </div>
+            <template-hook hook-name="agendaListAdditionalContentColumn"></template-hook>
           </small>
         </div>
         <div style="width: 40%;" class="pull-right">
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index dedd997c6..847cd6564 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -1512,6 +1512,11 @@ img {
     margin-left: 2px;
 }
 
+/* Bootbox: override z-index, that bootboxes are higher than ngDialogs */
+.bootbox {
+    z-index: 100000;
+}
+
 /* angular-chosen: override default width of select fields in quickmode */
 .chosen-container {
     width: 100% !important;
diff --git a/openslides/core/static/js/core/base.js b/openslides/core/static/js/core/base.js
index 152646efd..31c03f019 100644
--- a/openslides/core/static/js/core/base.js
+++ b/openslides/core/static/js/core/base.js
@@ -476,6 +476,17 @@ angular.module('OpenSlidesApp.core', [
 ])
 
 // Template hooks
+// 2 possible uses:
+// - { Id: 'myHookId', template: '<button>click me</button>' }
+// - { Id: 'myHookId', templateUrl: '/static/templates/plugin_name/my-hook.html' }
+// It is possible to provide a scope, that is merged into the scope of the templateHook.
+// This overrides functions/values of the parent scope, but there may are conflicts
+// with other plugins defining the same function/value. E.g.:
+// { Id: 'hookId', template: '<button ng-click="customFn()">click me</button>',
+//   scope: {
+//     customFn: function () { /*Do something */ },
+//   },
+// }
 .factory('templateHooks', [
     function () {
         var hooks = {};
@@ -493,22 +504,36 @@ angular.module('OpenSlidesApp.core', [
 
 .directive('templateHook', [
     '$compile',
+    '$http',
+    '$q',
+    '$templateCache',
     'templateHooks',
-    function ($compile, templateHooks) {
+    function ($compile, $http, $q, $templateCache, templateHooks) {
         return {
             restrict: 'E',
             template: '',
             link: function (scope, iElement, iAttr) {
                 var hooks = templateHooks.hooks[iAttr.hookName];
-                var html;
                 if (hooks) {
-                    html = hooks.map(function (hook) {
-                        return '<div>' + hook.template + '</div>';
-                    }).join('');
-                } else {
-                    html = '';
+                    var templates = _.map(hooks, function (hook) {
+                        // Populate scope
+                        _.forEach(hook.scope, function (value, key) {
+                            if (!scope.hasOwnProperty(key)) {
+                                scope[key] = value;
+                            }
+                        });
+                        // Either a template (html given as string) or a templateUrl has
+                        // to be given. If a scope is provided, the schope of this templateHook
+                        // is populated with the given functions/values.
+                        if (hook.template) {
+                            return '<div>' + hook.template + '</div>';
+                        } else {
+                            return $templateCache.get(hook.templateUrl);
+                        }
+                    });
+                    var html = templates.join('');
+                    iElement.append($compile(html)(scope));
                 }
-                iElement.append($compile(html)(scope));
             }
         };
     }
diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index 51821bb13..f8e7f2aa5 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -80,7 +80,9 @@ angular.module('OpenSlidesApp.core.site', [
                     this.scope = scope;
                 },
                 updateMainMenu: function () {
-                    this.scope.elements = this.getElements();
+                    if (this.scope) {
+                        this.scope.elements = this.getElements();
+                    }
                 },
                 getElements: function() {
                     var elements = mainMenuList.filter(function (element) {