diff --git a/openslides/core/static/templates/core/manage-projectors.html b/openslides/core/static/templates/core/manage-projectors.html index a5e6c0b59..8e1aa4574 100644 --- a/openslides/core/static/templates/core/manage-projectors.html +++ b/openslides/core/static/templates/core/manage-projectors.html @@ -26,7 +26,8 @@ - @@ -184,7 +185,8 @@
diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html index dc94212b0..eed6d5892 100644 --- a/openslides/motions/static/templates/motions/motion-list.html +++ b/openslides/motions/static/templates/motions/motion-list.html @@ -288,7 +288,7 @@
- +
diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js index c7284915d..2b867cf5f 100644 --- a/openslides/users/static/js/users/site.js +++ b/openslides/users/static/js/users/site.js @@ -685,9 +685,19 @@ angular.module('OpenSlidesApp.users.site', [ 'User', 'user', 'Group', - function($scope, ngDialog, UserForm, User, user, Group) { + 'Projector', + 'ProjectionDefault', + function($scope, ngDialog, UserForm, User, user, Group, Projector, ProjectionDefault) { User.bindOne(user.id, $scope, 'user'); Group.bindAll({where: {id: {'>': 1}}}, $scope, 'groups'); + $scope.$watch(function () { + return Projector.lastModified(); + }, function () { + var projectiondefault = ProjectionDefault.filter({name: 'users'})[0]; + if (projectiondefault) { + $scope.defaultProjectorId = projectiondefault.projector_id; + } + }); // open edit dialog $scope.openDialog = function (user) { diff --git a/openslides/users/static/templates/users/user-detail.html b/openslides/users/static/templates/users/user-detail.html index 11518eb64..94e48fd13 100644 --- a/openslides/users/static/templates/users/user-detail.html +++ b/openslides/users/static/templates/users/user-detail.html @@ -6,12 +6,8 @@ Back to overview - - - + +
- +