Add collaborators view to teams manager
Adds a view of an organization's outside collaborators to the team manager interface.
This commit is contained in:
Brad Ison
parent
e8429f9194
commit
452379c603
2 changed files with 99 additions and 42 deletions
|
|
@ -12,19 +12,23 @@
|
|||
<div class="tab-header-controls hidden-xs">
|
||||
<div class="btn-group btn-group-sm" ng-show="organization.is_admin">
|
||||
<button class="btn"
|
||||
ng-class="!showingMembers ? 'btn-primary active' : 'btn-default'" ng-click="showMembers(false)">
|
||||
ng-class="activeView == views.TEAMS ? 'btn-primary active' : 'btn-default'" ng-click="setActiveView(views.TEAMS)">
|
||||
<i class="fa fa-group"></i>Teams View
|
||||
</button>
|
||||
<button class="btn"
|
||||
ng-class="showingMembers ? 'btn-info active' : 'btn-default'" ng-click="showMembers(true)">
|
||||
ng-class="activeView == views.MEMBERS ? 'btn-info active' : 'btn-default'" ng-click="setActiveView(views.MEMBERS)">
|
||||
<i class="fa fa-user"></i>Members View
|
||||
</button>
|
||||
<button class="btn"
|
||||
ng-class="activeView == views.COLLABORATORS ? 'btn-info active' : 'btn-default'" ng-click="setActiveView(views.COLLABORATORS)">
|
||||
<i class="fa fa-user-circle"></i>Collaborators View
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Teams List -->
|
||||
<div ng-show="!showingMembers">
|
||||
<div ng-show="activeView == views.TEAMS">
|
||||
<button class="btn btn-primary hidden-xs"
|
||||
ng-show="organization.is_admin"
|
||||
style="margin-bottom: 10px; "
|
||||
|
|
@ -127,35 +131,35 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Members List -->
|
||||
<div ng-show="showingMembers">
|
||||
<div class="cor-loader" ng-if="!fullMemberList"></div>
|
||||
<!-- Members or Collaborators List -->
|
||||
<div ng-show="activeView == views.MEMBERS || activeView == views.COLLABORATORS">
|
||||
<div class="cor-loader" ng-if="!usersView"></div>
|
||||
|
||||
<div class="filter-box" collection="fullMemberList" filter-model="memberFilter"
|
||||
filter-name="Organization Members"></div>
|
||||
<div class="filter-box" collection="usersView" filter-model="userFilter"
|
||||
filter-name="Users"></div>
|
||||
|
||||
<div class="empty" ng-if="fullMemberList.length && !(fullMemberList | filter:memberFilter).length">
|
||||
<div class="empty-primary-msg">No organization members found matching filter.</div>
|
||||
<div class="empty" ng-if="usersView.length && !(usersView | filter:userFilter).length">
|
||||
<div class="empty-primary-msg">No users found matching filter.</div>
|
||||
<div class="empty-secondary-msg">
|
||||
Please change your filter to display members.
|
||||
Please change your filter to display users.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table class="cor-table" ng-if="(fullMemberList | filter:memberFilter).length">
|
||||
<table class="cor-table">
|
||||
<thead>
|
||||
<td>Member Name</td>
|
||||
<td>Teams</td>
|
||||
<td>User Name</td>
|
||||
<td ng-if="activeView == views.MEMBERS">Teams</td>
|
||||
<td>Direct Repository Permissions</td>
|
||||
<td class="options-col"></td>
|
||||
</thead>
|
||||
|
||||
<tbody ng-repeat="memberInfo in fullMemberList | filter:memberFilter | orderBy:'name'" bindonce>
|
||||
<tbody ng-repeat="orgUser in usersView | filter:userFilter | orderBy:'name'" bindonce>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="entity-reference" entity="memberInfo"></div>
|
||||
<div class="entity-reference" entity="orgUser"></div>
|
||||
</td>
|
||||
<td>
|
||||
<span ng-repeat="team in memberInfo.teams"
|
||||
<td ng-if="activeView == views.MEMBERS">
|
||||
<span ng-repeat="team in orgUser.teams"
|
||||
data-title="Team {{ team.name }}" bs-tooltip>
|
||||
<span class="anchor" href="/organization/{{ organization.name }}/teams/{{ team.name }}">
|
||||
<span class="avatar" size="24" data="team.avatar"></span>
|
||||
|
|
@ -163,20 +167,20 @@
|
|||
</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="empty" bo-if="memberInfo.repositories.length == 0">
|
||||
<span class="empty" bo-if="orgUser.repositories.length == 0">
|
||||
(No direct permissions on any repositories)
|
||||
</span>
|
||||
|
||||
<span class="member-perm-summary" bo-if="memberInfo.repositories.length > 0">
|
||||
Direct permissions on {{ memberInfo.repositories.length }}
|
||||
<span bo-if="memberInfo.repositories.length == 1">repository</span>
|
||||
<span bo-if="memberInfo.repositories.length > 1">repositories</span>
|
||||
<span class="member-perm-summary" bo-if="orgUser.repositories.length > 0">
|
||||
Direct permissions on {{ orgUser.repositories.length }}
|
||||
<span bo-if="orgUser.repositories.length == 1">repository</span>
|
||||
<span bo-if="orgUser.repositories.length > 1">repositories</span>
|
||||
under this organization
|
||||
</span>
|
||||
</td>
|
||||
<td class="options-col">
|
||||
<span class="cor-options-menu" ng-if="memberInfo.name != user.username">
|
||||
<span class="cor-option" option-click="askRemoveMember(memberInfo)">
|
||||
<span class="cor-options-menu" ng-if="orgUser.name != user.username">
|
||||
<span class="cor-option" option-click="askRemoveMember(orgUser)">
|
||||
<i class="fa fa-times"></i> Remove From Organization
|
||||
</span>
|
||||
</span>
|
||||
|
|
@ -197,8 +201,8 @@
|
|||
<div class="cor-confirm-dialog"
|
||||
dialog-context="removeMemberInfo"
|
||||
dialog-action="removeMember(info, callback)"
|
||||
dialog-title="Remove Organization Member"
|
||||
dialog-action-title="Remove Member">
|
||||
dialog-title="Remove User from Organization"
|
||||
dialog-action-title="Remove">
|
||||
<div class="co-alert co-alert-info" style="margin-bottom: 10px;">
|
||||
<span class="entity-reference" entity="removeMemberInfo"></span> will be removed from all teams and repositories under this organization in which they are a
|
||||
member or have permissions.
|
||||
|
|
|
|||
Reference in a new issue