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 @@
+ + 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': {},