diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-04 11:55:33 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-04 11:55:33 +0100 |
| commit | a07b7482bb2f9d2867dafc909da8af90d5ee9143 (patch) | |
| tree | 360e5a8b3cc1f9c0ccf79575709b0a9787924dd3 /app/views/group_memberships | |
| parent | aaffa89ef9aef6ac30e3304d735a8c58f4bdaaef (diff) | |
| parent | 8042e6c314737feab61209e0b8b26ddba5c7e763 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/group_memberships')
| -rw-r--r-- | app/views/group_memberships/_index_core.html.haml | 3 | ||||
| -rw-r--r-- | app/views/group_memberships/show.html.haml | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/group_memberships/_index_core.html.haml b/app/views/group_memberships/_index_core.html.haml index beeefc9..31a9050 100644 --- a/app/views/group_memberships/_index_core.html.haml +++ b/app/views/group_memberships/_index_core.html.haml @@ -2,10 +2,11 @@ %tr %th= t('group_memberships.index.item_type') %th= t('group_memberships.index.item_id') - + %th= t('group_memberships.index.item') - for group_membership in group_memberships %tr %td= group_membership.item_type %td= group_membership.item_id + %td= group_membership.item =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => group_membership.group, :child => group_membership} diff --git a/app/views/group_memberships/show.html.haml b/app/views/group_memberships/show.html.haml index 0875f0b..362b25f 100644 --- a/app/views/group_memberships/show.html.haml +++ b/app/views/group_memberships/show.html.haml @@ -7,4 +7,8 @@ %strong= t('group_memberships.show.item_id') + ":" = @group_membership.item_id +%p + %strong= t('group_memberships.show.item') + ":" + = @group_membership.item + = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @group, :child => @group_membership } |