Merge branch 'develop'5.1-beta6

1 files changed, 10 insertions, 0 deletions

diff --git a/app/views/group_permissions/show.html.haml b/app/views/group_permissions/show.html.haml
new file mode 100644
index 0000000..402c5ce
--- /dev/null
+++ b/app/views/group_permissions/show.html.haml
@@ -0,0 +1,10 @@
+- content_for :title, t("group_permissions.show.page_title")
+
+%p
+  %strong= t('group_permissions.show.permission') + ":"
+  = @group_permission.permission
+%p
+  %strong= t('group_permissions.show.target_group_id') + ":"
+  = @group_permission.target_group_id
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @group, :child => @group_permission }