From 2af38f75bb4a01988d0e3957eed910f54d7997b0 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 19 Mar 2016 13:41:03 +0100
Subject: [PATCH] Fix edit current slide button.

---
 openslides/core/static/js/core/site.js        |  1 +
 .../templates/core/projector-controls.html    |  2 ++
 openslides/users/static/js/users/site.js      | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index f3883c98d..0752d56d3 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -811,6 +811,7 @@ angular.module('OpenSlidesApp.core.site', [
                 if (value.name == 'agenda/list-of-speakers') {
                     $state.go('agenda.item.detail', {id: value.id});
                 } else if (
+                    value.name != 'agenda/item-list' &&
                     value.name != 'core/clock' &&
                     value.name != 'core/countdown' &&
                     value.name != 'core/message' ) {
diff --git a/openslides/core/static/templates/core/projector-controls.html b/openslides/core/static/templates/core/projector-controls.html
index 0565e5f68..665789fb7 100644
--- a/openslides/core/static/templates/core/projector-controls.html
+++ b/openslides/core/static/templates/core/projector-controls.html
@@ -17,6 +17,8 @@
         </a>
         <!-- projector control buttons -->
         <div os-perms="core.can_manage_projector">
+
+          <!-- edit -->
           <a ng-click="editCurrentSlide()"
               class="btn btn-default btn-sm"
               title="{{ 'Edit current slide' | translate}}">
diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js
index afc711e77..c9537e195 100644
--- a/openslides/users/static/js/users/site.js
+++ b/openslides/users/static/js/users/site.js
@@ -58,6 +58,26 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
                 }
             }
         })
+        // Redirects to user detail view and opens user edit form dialog, uses edit url.
+        // Used by $state.go(..) from core/site.js only (for edit current slide button).
+        // (from users list controller use UserForm factory instead to open dialog in front of
+        // current view without redirect)
+        .state('users.user.detail.update', {
+            onEnter: ['$stateParams', '$state', 'ngDialog', 'User',
+                function($stateParams, $state, ngDialog, User) {
+                    ngDialog.open({
+                        template: 'static/templates/users/user-form.html',
+                        controller: 'UserUpdateCtrl',
+                        className: 'ngdialog-theme-default wide-form',
+                        closeByEscape: false,
+                        closeByDocument: false,
+                        resolve: {
+                            user: function() {return User.find($stateParams.id);}
+                        }
+                    });
+                }
+            ]
+        })
         .state('users.user.detail.profile', {
             views: {
                 '@users.user': {},