From d3d73a019d234806e1fc5eab23e38f16cb8e058e Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 24 Feb 2016 20:50:32 +0100 Subject: [PATCH] Fix translations in group detail template. --- openslides/users/static/js/users/site.js | 16 +++++++++++++++- .../static/templates/users/group-detail.html | 6 +++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js index 1108e7604..f9e87c139 100644 --- a/openslides/users/static/js/users/site.js +++ b/openslides/users/static/js/users/site.js @@ -105,6 +105,9 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users']) resolve: { group: function(Group, $stateParams) { return Group.find($stateParams.id); + }, + permissions: function(Group) { + return Group.getPermissions(); } } }) @@ -854,8 +857,19 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users']) '$scope', 'Group', 'group', - function($scope, Group, group) { + 'permissions', + function($scope, Group, group, permissions) { Group.bindOne(group.id, $scope, 'group'); + $scope.groupPermissionNames = []; + // get display names of group permissions + // from an object array with all available permissions [{display_name, value}] + angular.forEach(group.permissions, function(permValue) { + angular.forEach(permissions, function(p) { + if (p.value == permValue) { + $scope.groupPermissionNames.push(p.display_name); + } + }); + }); } ]) diff --git a/openslides/users/static/templates/users/group-detail.html b/openslides/users/static/templates/users/group-detail.html index 864673c25..578170220 100644 --- a/openslides/users/static/templates/users/group-detail.html +++ b/openslides/users/static/templates/users/group-detail.html @@ -6,14 +6,14 @@ Back to overview -

{{ group.name }}

+

{{ group.name | translate }}

Group

Permissions:

-