Work in progress: Continue on org view
This commit is contained in:
parent
17a07ea6e0
commit
b56bb92801
4 changed files with 18 additions and 5 deletions
|
@ -1238,6 +1238,8 @@ function TeamViewCtrl($rootScope, $scope, Restangular, $routeParams) {
|
|||
$scope.organization = resp;
|
||||
$scope.loading = !$scope.organization || !$scope.members;
|
||||
}, function() {
|
||||
$scope.organization = null;
|
||||
$scope.members = null;
|
||||
$scope.loading = false;
|
||||
});
|
||||
};
|
||||
|
@ -1250,6 +1252,8 @@ function TeamViewCtrl($rootScope, $scope, Restangular, $routeParams) {
|
|||
$scope.loading = !$scope.organization || !$scope.members;
|
||||
$rootScope.title = teamname + ' (' + orgname + ')';
|
||||
}, function() {
|
||||
$scope.organization = null;
|
||||
$scope.members = null;
|
||||
$scope.loading = false;
|
||||
});
|
||||
};
|
||||
|
|
|
@ -11,6 +11,13 @@
|
|||
|
||||
<div ng-repeat="team in organization.teams">
|
||||
<i class="fa fa-group"></i>
|
||||
<span><a href="/organization/{{ organization.name }}/teams/{{ team.name }}">{{ team.name }}</a></span>
|
||||
|
||||
<span ng-show="team.can_view">
|
||||
<a href="/organization/{{ organization.name }}/teams/{{ team.name }}">{{ team.name }}</a>
|
||||
</span>
|
||||
|
||||
<span ng-show="!team.can_view">
|
||||
{{ team.name }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Reference in a new issue