opendev/storyboard-webclient
Code Issues Proposed changes

Merge "Allow the Subscribe directive to work without a list of subscriptions"

Browse Source
This commit is contained in:
Jenkins 2016-06-14 13:47:31 +00:00 committed by Gerrit Code Review
commit b61fbb908b
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/stories/controller/story_detail_controller.js
View File

@ -21,8 +21,7 @@ angular.module('sb.story').controller('StoryDetailController',
function ($log, $rootScope, $scope, $state, $stateParams, $modal, Session, function ($log, $rootScope, $scope, $state, $stateParams, $modal, Session,
Preference, TimelineEvent, Comment, TimelineEventTypes, story, Preference, TimelineEvent, Comment, TimelineEventTypes, story,
Story, creator, tasks, Task, DSCacheFactory, User, $q, Story, creator, tasks, Task, DSCacheFactory, User, $q,
storyboardApiBase, SubscriptionList, CurrentUser, storyboardApiBase, SessionModalService, moment, $document) {
SessionModalService, moment, $document) {
'use strict'; 'use strict';
var pageSize = Preference.get('story_detail_page_size'); var pageSize = Preference.get('story_detail_page_size');
@ -510,12 +509,4 @@ angular.module('sb.story').controller('StoryDetailController',
}, },
handleServiceError); handleServiceError);
}; };
//GET subscriptions
var cuPromise = CurrentUser.resolve();
cuPromise.then(function(user){
$scope.storySubscriptions = SubscriptionList.subsList(
'story', user);
});
}); });

3
src/app/stories/template/detail.html
View File

@ -56,8 +56,7 @@
<i class="fa fa-pencil"></i> <i class="fa fa-pencil"></i>
</a> </a>
<subscribe resource="story" <subscribe resource="story"
resource-id="story.id" resource-id="story.id">
subscriptions="storySubscriptions">
</subscribe> </subscribe>
<button type="button" <button type="button"
class="btn btn-link" class="btn btn-link"

21
src/app/subscription/directive/subscribe.js
View File

@ -188,23 +188,22 @@ angular.module('sb.util').directive('subscribe',
$scope.resolving = true; $scope.resolving = true;
cuPromise.then( cuPromise.then(function () {
function () { angular.forEach($scope.subscriptions, function(sub) {
angular.forEach($scope.subscriptions, if ($scope.resourceId === sub.target_id) {
function(subscription) { setSubscription(sub);
if ($scope.resourceId ===
subscription.target_id) {
setSubscription(subscription);
} }
} });
);
$scope.resolving = false; $scope.resolving = false;
} });
);
} }
// On initialization, resolve. // On initialization, resolve.
if (!!$scope.subscriptions) {
$scope.subscriptions.$promise.then(resolveSubsList); $scope.subscriptions.$promise.then(resolveSubsList);
} else {
resolveSubscription();
}
} }
}; };
}); });