Merge "Fix subscription display for project groups"

src/app/project_group/controller/project_group_admin_controller.js

@@ -18,7 +18,8 @@
  * Administration controller for project groups.
  */
 angular.module('sb.project_group').controller('ProjectGroupAdminController',
-    function ($scope, $modal, ProjectGroup, Preference, isSuperuser) {
+    function ($scope, $modal, ProjectGroup, Preference, isSuperuser,
+             CurrentUser, SubscriptionList) {
         'use strict';
 
         /**
@@ -37,6 +38,16 @@ angular.module('sb.project_group').controller('ProjectGroupAdminController',
          */
         $scope.filterQuery = '';
 
+        //GET list of project group subscriptions
+        var cuPromise = CurrentUser.resolve();
+
+        cuPromise.then(function(user){
+            $scope.projectGroupSubscriptions =
+            SubscriptionList.subsList(
+                'project_group', user);
+        });
+
+
         /**
          * Launches the add-project-group modal.
          */

src/app/project_group/template/project_group.html

@@ -99,7 +99,8 @@
                                ng-show="isLoggedIn">
                                <subscribe
                                    resource="project_group"
-                                   resource-id="projectGroup.id">
+                                   resource-id="projectGroup.id"
+                                   subscriptions="projectGroupSubscriptions">
                                </subscribe>
                             </a>
                             <a class="btn btn-link "