ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Make timeline tab only available if comments/activity apps are enabled

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-10-09 17:15:38 +02:00
parent 1d777550ed
commit 29756e1e8c
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/controller/BoardController.js
View File

@@ -486,4 +486,9 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
$scope.unreadCommentCount = function(card) { $scope.unreadCommentCount = function(card) {
return card.commentsUnread; return card.commentsUnread;
}; };
$scope.isTimelineEnabled = function() {
return OCP.Comments && OCA.Activity;
};
}); });

4
js/controller/CardController.js
View File

@@ -278,4 +278,8 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
}; };
}; };
$scope.isTimelineEnabled = function() {
return OCP.Comments && OCA.Activity;
};
}); });

4
templates/part.board.sidebarView.php
View File

@@ -16,7 +16,7 @@
<li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><a><?php p($l->t('Tags')); ?></a></li> <li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><a><?php p($l->t('Tags')); ?></a></li>
<li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}"><a><?php p($l->t('Deleted Stacks')); ?></a></li> <li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}"><a><?php p($l->t('Deleted Stacks')); ?></a></li>
<li class="tabHeader" ng-class="{'selected': (params.tab==3)}" ui-sref="{tab: 3}"><a><?php p($l->t('Deleted Cards')); ?></a></li> <li class="tabHeader" ng-class="{'selected': (params.tab==3)}" ui-sref="{tab: 3}"><a><?php p($l->t('Deleted Cards')); ?></a></li>
<li class="tabHeader" ng-class="{'selected': (params.tab==4)}" ui-sref="{tab: 4}"><a><?php p($l->t('Activity')); ?></a></li> <li class="tabHeader" ng-class="{'selected': (params.tab==4)}" ui-sref="{tab: 4}" ng-if="isTimelineEnabled()"><a><?php p($l->t('Timeline')); ?></a></li>
</ul> </ul>
<div class="tabsContainer"> <div class="tabsContainer">
@@ -150,7 +150,7 @@
</ul> </ul>
</div> </div>
<div id="board-detail-activity" class="tab activityTabView" ng-if="params.tab==4"> <div id="board-detail-activity" class="tab activityTabView" ng-if="isTimelineEnabled() && params.tab==4">
<activity-component ng-if="boardservice.getCurrent()" type="deck_board" element="boardservice.getCurrent()"></activity-component> <activity-component ng-if="boardservice.getCurrent()" type="deck_board" element="boardservice.getCurrent()"></activity-component>
</div> </div>

5
templates/part.card.php
View File

@@ -92,8 +92,7 @@
<ul class="tabHeaders ng-scope"> <ul class="tabHeaders ng-scope">
<li class="tabHeader" ng-class="{'selected': (params.tab==0 || !params.tab)}" ui-sref="{tab: 0}"><a><span class="icon icon-description"></span><?php p($l->t('Description')); ?></a></li> <li class="tabHeader" ng-class="{'selected': (params.tab==0 || !params.tab)}" ui-sref="{tab: 0}"><a><span class="icon icon-description"></span><?php p($l->t('Description')); ?></a></li>
<li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><a><span class="icon icon-files-dark"></span><?php p($l->t('Attachments')); ?></a></li> <li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><a><span class="icon icon-files-dark"></span><?php p($l->t('Attachments')); ?></a></li>
<li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}"><a><span class="icon icon-activity"></span><?php p($l->t('Activity/Comments')); ?></a></li> <li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}" ng-if="isTimelineEnabled()"><a><span class="icon icon-activity"></span><?php p($l->t('Timeline')); ?></a></li>
</ul> </ul>
<div class="tabDetails"> <div class="tabDetails">
<span class="save-indicator saved"><?php p($l->t('Saved')); ?></span> <span class="save-indicator saved"><?php p($l->t('Saved')); ?></span>
@@ -131,7 +130,7 @@
</div> </div>
</div> </div>
<div class="section-content card-activity activityTabView" ng-if="params.tab === 2"> <div class="section-content card-activity activityTabView" ng-if="isTimelineEnabled() && params.tab === 2">
<activity-component type="deck_card" element="cardservice.getCurrent()"></activity-component> <activity-component type="deck_card" element="cardservice.getCurrent()"></activity-component>
</div> </div>