fixed merge issues

Author: EvgenySafronov

src/app/pages/project/suite/suite-view/testsuite.view.component.html

@@ -63,7 +63,8 @@ <h2 class="pull-left" id="suite-view">Test Suite:</h2>
 <div class="panel-body">
   <table-filter id="test-table" *ngIf="tbCols && testSuite && testSuite.tests" #table [rowsOnPageSet]="[5,10,20]"
     [rowsOnPage]="20" [queryParams]="true" [data]="testSuite.tests" [columns]="tbCols"
-    [defaultSortBy]="sortBy" [allowDelete]="allowEdit" [allowBulkUpdate]="allowEdit"
-    [urlGenerator]="generateTestUrl" (rowClick)="rowClicked($event)" (dataChange)="testUpdate($event)" 
-    (action)="handleAction($event)" (bulkChanges)="bulkUpdate($event)"></table-filter>
+    [defaultSortBy]="sortBy" [allowDelete]="allowEdit" [allowBulkUpdate]="allowEdit" [allowBulkDelete]="allowDelete"
+    [urlGenerator]="generateTestUrl" (rowClick)="rowClicked($event)" (bulkDelete)="bulkDelete($event)"
+    (dataChange)="testUpdate($event)" (action)="handleAction($event)" (bulkChanges)="bulkUpdate($event)">
+  </table-filter>
 </div>

src/app/pages/project/suite/suite-view/testsuite.view.component.ts

@@ -185,7 +185,6 @@ export class TestSuiteViewComponent implements OnInit {
 
   generateTestUrl(entity: Test) {
     return `/project/${entity.project_id}/test/${entity.id}`;
-    //return `/project/${this.projectId}/test/${entity.id}`;
   }
 
   rowClicked($event: Test) {