Merge pull request #1848 from opf/feature/15087_change_wp_displayed_in_details_pane_by_left_clicking

15087 change wp displayed in details pane by left clicking
pull/1853/head
Alex Coles 10 years ago
commit b3df8cc7c5
  1. 6
      app/assets/javascripts/angular/work_packages/controllers/work-packages-list-controller.js
  2. 4
      app/assets/javascripts/angular/work_packages/directives/work-packages-table-directive.js
  3. 2
      public/templates/work_packages.list.html

@ -272,7 +272,9 @@ angular.module('openproject.workPackages.controllers')
$state.go(latestTab.getStateName(), { workPackageId: $scope.preselectedWorkPackageId }); $state.go(latestTab.getStateName(), { workPackageId: $scope.preselectedWorkPackageId });
}; };
$scope.showWorkPackageDetails = function(id) { $scope.showWorkPackageDetails = function(id, force) {
$state.go(latestTab.getStateName(), { workPackageId: id }); if (force || $state.current.controller == "DetailsTabOverviewController") {
$state.go(latestTab.getStateName(), { workPackageId: id });
}
}; };
}]); }]);

@ -126,6 +126,8 @@ angular.module('openproject.workPackages.directives')
activeSelectionBorderIndex = WorkPackagesTableService.selectRowRange(scope.rows, row, activeSelectionBorderIndex); activeSelectionBorderIndex = WorkPackagesTableService.selectRowRange(scope.rows, row, activeSelectionBorderIndex);
} else { } else {
setRowSelectionState(row, !currentRowCheckState); setRowSelectionState(row, !currentRowCheckState);
scope.activationCallback({ id: row.object.id, force: false });
} }
} }
}; };
@ -137,7 +139,7 @@ angular.module('openproject.workPackages.directives')
setRowSelectionState(row, true); setRowSelectionState(row, true);
scope.activationCallback({ id: row.object.id }); scope.activationCallback({ id: row.object.id, force: true });
}; };
} }
}; };

@ -132,7 +132,7 @@
display-sums="query.displaySums" display-sums="query.displaySums"
total-sums="totalSums" total-sums="totalSums"
group-sums="groupSums" group-sums="groupSums"
activation-callback="showWorkPackageDetails(id)"> activation-callback="showWorkPackageDetails(id, force)">
</work-packages-table> </work-packages-table>
</div> </div>
<div class="work-packages--list-pagination-area"> <div class="work-packages--list-pagination-area">

Loading…
Cancel
Save