From 4559ffb88227a93914a0c23def02c82516f5fb84 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 14 Sep 2015 20:51:14 +0200
Subject: [PATCH] Fix agenda slide and agendaIsProjected function.

---
 openslides/agenda/static/js/agenda/agenda.js  | 137 +++++++++---------
 .../static/templates/agenda/item-list.html    |   2 +-
 2 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/openslides/agenda/static/js/agenda/agenda.js b/openslides/agenda/static/js/agenda/agenda.js
index e0267da5b..6a77f0445 100644
--- a/openslides/agenda/static/js/agenda/agenda.js
+++ b/openslides/agenda/static/js/agenda/agenda.js
@@ -49,6 +49,71 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
     }
 ])
 
+.factory('AgendaTree', [
+    function () {
+        return {
+            getTree: function (items) {
+                // Sort items after there weight
+                items.sort(function(itemA, itemB) {
+                    return itemA.weight - itemB.weight;
+                });
+
+                // Build a dict with all children (dict-value) to a specific
+                // item id (dict-key).
+                var itemChildren = {};
+
+                _.each(items, function (item) {
+                    if (item.parent_id) {
+                        // Add item to his parent. If it is the first child, then
+                        // create a new list.
+                        try {
+                            itemChildren[item.parent_id].push(item);
+                        } catch (error) {
+                            itemChildren[item.parent_id] = [item];
+                        }
+                    }
+
+                });
+
+                // Recursive function that generates a nested list with all
+                // items with there children
+                function getChildren(items) {
+                    var returnItems = [];
+                    _.each(items, function (item) {
+                        returnItems.push({
+                            item: item,
+                            children: getChildren(itemChildren[item.id]),
+                            id: item.id,
+                        });
+                    });
+                    return returnItems;
+                }
+
+                // Generates the list of root items (with no parents)
+                var parentItems = items.filter(function (item) {
+                    return !item.parent_id;
+                });
+                return getChildren(parentItems);
+            },
+            // Returns a list of all items as a flat tree the attribute parentCount
+            getFlatTree: function(items) {
+                var tree = this.getTree(items);
+                var flatItems = [];
+
+                function generateFatTree(tree, parentCount) {
+                    _.each(tree, function (item) {
+                        item.item.parentCount = parentCount;
+                        flatItems.push(item.item);
+                        generateFatTree(item.children, parentCount + 1);
+                    });
+                }
+                generateFatTree(tree, 0);
+                return flatItems;
+            },
+        }
+    }
+])
+
 // Make sure that the Agenda resource is loaded.
 .run(['Agenda', function(Agenda) {}]);
 
@@ -139,68 +204,6 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
     }
 ])
 
-.factory('AgendaTree', [
-    function () {
-        return {
-            getTree: function (items) {
-                // TODO: sortieren nach weight???
-
-                // Build a dict with all children (dict-value) to a specific
-                // item id (dict-key).
-                var itemChildren = {};
-
-                _.each(items, function (item) {
-                    if (item.parent_id) {
-                        // Add item to his parent. If it is the first child, then
-                        // create a new list.
-                        try {
-                            itemChildren[item.parent_id].push(item);
-                        } catch (error) {
-                            itemChildren[item.parent_id] = [item];
-                        }
-                    }
-
-                });
-
-                // Recursive function that generates a nested list with all
-                // items with there children
-                function getChildren(items) {
-                    var returnItems = [];
-                    _.each(items, function (item) {
-                        returnItems.push({
-                            item: item,
-                            children: getChildren(itemChildren[item.id]),
-                            id: item.id,
-                        });
-                    });
-                    return returnItems;
-                }
-
-                // Generates the list of root items (with no parents)
-                var parentItems = items.filter(function (item) {
-                    return !item.parent_id;
-                });
-                return getChildren(parentItems);
-            },
-            // Returns a list of all items as a flat tree the attribute parentCount
-            getFlatTree: function(items) {
-                var tree = this.getTree(items);
-                var flatItems = [];
-
-                function generateFatTree(tree, parentCount) {
-                    _.each(tree, function (item) {
-                        item.item.parentCount = parentCount;
-                        flatItems.push(item.item);
-                        generateFatTree(item.children, parentCount + 1);
-                    });
-                }
-                generateFatTree(tree, 0);
-                return flatItems;
-            },
-        }
-    }
-])
-
 .controller('ItemListCtrl', [
     '$scope',
     '$http',
@@ -265,10 +268,10 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
             var projector = Projector.get(1);
             if (typeof projector === 'undefined') return false;
             var self = this;
-            return _.findIndex(projector.elements, function(element) {
-                return element.name == 'agenda/item-list'
-            }) > -1;
-
+            var predicate = function (element) {
+                return element.name == 'agenda/item-list';
+            };
+            return typeof _.findKey(projector.elements, predicate) === 'string';
         };
     }
 ])
@@ -492,7 +495,7 @@ angular.module('OpenSlidesApp.agenda.projector', ['OpenSlidesApp.agenda'])
         // Attention! Each object that is used here has to be dealt on server side.
         // Add it to the coresponding get_requirements method of the ProjectorElement
         // class.
-
+        Agenda.findAll();
         // Bind agenda tree to the scope
         $scope.$watch(function () {
             return Agenda.lastModified();
diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 9b2041ffb..a5dd80d6a 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -73,7 +73,7 @@
       <!-- projector column -->
       <th ng-show="!isDeleteMode" os-perms="core.can_manage_projector" class="firstColumn">
       <!-- delete selection column -->
-      <th ng-show="isDeleteMode" os-perms-lite="agenda.can_manage" class="firstColumn deleteColumn"
+      <th ng-show="isDeleteMode" os-perms="agenda.can_manage" class="firstColumn deleteColumn"
           ng-click="$event.stopPropagation();">
         <input type="checkbox" ng-model="selectedAll" ng-change="checkAll()">
       <!-- agenda item column -->