diff --git a/src/client/app/js/app/model/Profile.js b/src/client/app/js/app/model/Profile.js index b661815..8311827 100644 --- a/src/client/app/js/app/model/Profile.js +++ b/src/client/app/js/app/model/Profile.js @@ -223,6 +223,11 @@ app.model.Profile = function( data, groupsData ) teamData = gd; }; + this.getGroupStatus = function( groupId ) + { + return this.getGroupData(groupId).status; + } + this.isOwn = function() { return ( this.getId() == app.model.SessionUser.getUserProfile().getId() ); diff --git a/src/client/app/js/app/state/GroupMemberManagementMember.js b/src/client/app/js/app/state/GroupMemberManagementMember.js index f027071..459a743 100644 --- a/src/client/app/js/app/state/GroupMemberManagementMember.js +++ b/src/client/app/js/app/state/GroupMemberManagementMember.js @@ -11,7 +11,6 @@ app.state.GroupMemberManagementMember = function() state.onEnter = function( p ) { - console.log(p); let $content = app.core.View.getContent(), fnRenderMemberForm = null, fnGetMemberById = null, @@ -27,9 +26,9 @@ app.state.GroupMemberManagementMember = function() fnRenderMemberForm = function( profile ) { - let statusDeleted = false; + let status = ''; if (profile) { - statusDeleted = profile.getGroupData(groupId).status === 'deleted'; + status = profile.getGroupData(groupId).status; } $memberContainer = $content.find( '[data-id="member-container"]' ).first(); @@ -39,7 +38,7 @@ app.state.GroupMemberManagementMember = function() { p : profile, g : group, - statusDeleted: statusDeleted + status: status } ) ); diff --git a/src/client/app/tmpl/group-member-management-member-body.html b/src/client/app/tmpl/group-member-management-member-body.html index c84c55f..d3b2eea 100644 --- a/src/client/app/tmpl/group-member-management-member-body.html +++ b/src/client/app/tmpl/group-member-management-member-body.html @@ -81,7 +81,7 @@
- <% if ( statusDeleted === false ) { %> + <% if ( status !== 'deleted' ) { %>
<%= _lc( 'CHANGE_ROLE' ) %> diff --git a/src/client/manager/js/app/components/members/member-data-table.html b/src/client/manager/js/app/components/members/member-data-table.html index befac23..76a747e 100644 --- a/src/client/manager/js/app/components/members/member-data-table.html +++ b/src/client/manager/js/app/components/members/member-data-table.html @@ -9,6 +9,7 @@ Postleitzahl Stadt Telefon/Mobile + Status @@ -22,6 +23,7 @@ <%= members[ mi ].zip ? members[ mi ].zip : '' %> <%= members[ mi ].city ? members[ mi ].city : '' %> <%= members[ mi ].phone ? members[ mi ].phone : '---' %> / <%= members[ mi ].mobile ? members[ mi ].mobile : '---' %> + <%= members[ mi ].getGroupStatusText() %>