From 1ca390876b4a8b329af3d5499bb21cdb23c41283 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@rats-os.de>
Date: Fri, 11 Nov 2016 12:03:59 +0100
Subject: [PATCH] Hotfix for Issue #2566

---
 openslides/agenda/static/js/agenda/site.js               | 8 ++++++++
 openslides/agenda/static/templates/agenda/item-list.html | 2 +-
 openslides/motions/static/js/motions/site.js             | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js
index fa6b7d85f..9f3ee8381 100644
--- a/openslides/agenda/static/js/agenda/site.js
+++ b/openslides/agenda/static/js/agenda/site.js
@@ -156,6 +156,14 @@ angular.module('OpenSlidesApp.agenda.site', [
             }
         };
 
+        $scope.getUpdateStatePrefix = function (item) {
+            var prefix = item.content_object.collection.replace('/','.');
+            // Hotfix for Issue 2566.
+            // The changes could be reverted if Issue 2480 is closed.
+            prefix = prefix.replace('motion-block', 'motionBlock');
+            return prefix;
+        };
+
         // pagination
         $scope.currentPage = 1;
         $scope.itemsPerPage = 100;
diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 36ad8db65..0e80dee08 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -220,7 +220,7 @@
           <div os-perms="agenda.can_see" class="hoverActions" ng-class="{'hiddenDiv': !item.hover}">
             <a ui-sref="agenda.item.detail({id: item.id})" translate>List of speakers</a>
             <span os-perms="agenda.can_manage"> |
-              <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail.update({id: item.content_object.id})"
+              <a ui-sref="{{ getUpdateStatePrefix(item) }}.detail.update({id: item.content_object.id})"
                   translate>Edit</a> |
               <a href="" ng-click="item.quickEdit=true" translate>QuickEdit</a> |
               <a href="" class="text-danger"
diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js
index 4f0534610..cdbc3eba0 100644
--- a/openslides/motions/static/js/motions/site.js
+++ b/openslides/motions/static/js/motions/site.js
@@ -259,7 +259,7 @@ angular.module('OpenSlidesApp.motions.site', [
                             closeByDocument: false,
                             resolve: {
                                 motionBlock: function () {
-                                    return motionBlock;
+                                    return MotionBlock.find($stateParams.id);
                                 }
                             },
                             preCloseCallback: function() {