Merge pull request #2489 from 0xF013/add-busy-loaders

add busy loaders
pull/2560/head
Alex Coles 10 years ago
commit d7fb2aebc2
  1. 14
      frontend/app/work_packages/controllers/work-packages-list-controller.js
  2. 4
      frontend/public/templates/work_packages.list.html

@ -208,7 +208,7 @@ module.exports = function($scope, $rootScope, $state, $location, latestTab,
clearUrlQueryParams();
// Load new query
$state.go('work-packages.list', { query_id: queryId });
$scope.settingUpPage = $state.go('work-packages.list', { 'query_id': queryId });
};
function updateResults() {
@ -262,7 +262,12 @@ module.exports = function($scope, $rootScope, $state, $location, latestTab,
});
$scope.openLatestTab = function() {
$state.go(latestTab.getStateName(), { workPackageId: $scope.preselectedWorkPackageId, query_props: $location.search().query_props });
$scope.settingUpPage = $state.go(
latestTab.getStateName(),
{
workPackageId: $scope.preselectedWorkPackageId,
'query_props': $location.search()['query_props']
});
};
$scope.closeDetailsView = function() {
@ -276,7 +281,10 @@ module.exports = function($scope, $rootScope, $state, $location, latestTab,
$scope.showWorkPackageDetails = function(id, force) {
if (force || $state.current.url != "") {
$state.go(latestTab.getStateName(), { workPackageId: id, query_props: $location.search().query_props });
$scope.settingUpPage = $state.go(
latestTab.getStateName(),
{ workPackageId: id, 'query_props': $location.search()['query_props'] }
);
}
};
};

@ -85,8 +85,8 @@
<back-url></back-url>
<div class="work-packages--split-view">
<div class="work-packages--list" cg-busy="[settingUpPage,refreshWorkPackages]">
<div class="work-packages--split-view" cg-busy="[settingUpPage,refreshWorkPackages]">
<div class="work-packages--list">
<div class="work-packages--list-table-area">
<work-packages-table ng-if="rows && columns"
project-identifier="projectIdentifier"

Loading…
Cancel
Save