Merge branch 'stable' into devel

* stable: (30 commits)
  Remove ansible-tower.repo during packer cleanup
  Update package changelogs
  Enable SE boolean httpd_execmem
  Check that venv is activated before loading wsgi app (#3148)
  also limit creation of system auditors to superusers
  Make check for idle session more specific
  Use foreman.id instead
  flake8 fixups
  fixing tests for new team role assignment restrictions
  driveby cleanup
  do not allow assignment of system roles or user.admin_role to teams
  Add copyright back with utf-8 encoding
  Complete Sat6 integration
  Force requests to emit application/json
  fix issue with rbac_migrations logger
  Enable software collections repo on RHEL 6 + RHSM
  Fixed credential migration issue involving null inventory fields in job templates
  Allow instant cancel for new jobs
  Show new jobs in UI Jobs tab
  use existing logging infrastructure
  ...
This commit is contained in:
Matthew Jones
2016-08-01 11:51:26 -04:00
23 changed files with 137 additions and 194 deletions

View File

@@ -872,7 +872,7 @@ var tower = angular.module('Tower', [
} else {
var lastUser = $cookieStore.get('current_user'),
timestammp = Store('sessionTime');
if(lastUser && lastUser.id && timestammp && timestammp[lastUser.id]){
if(lastUser && lastUser.id && timestammp && timestammp[lastUser.id] && timestammp[lastUser.id].loggedIn){
var stime = timestammp[lastUser.id].time,
now = new Date().getTime();
if ((stime - now) <= 0) {

View File

@@ -67,7 +67,7 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa
list: AllJobsList,
id: 'active-jobs',
pageSize: 20,
url: GetBasePath('unified_jobs') + '?status__in=pending,waiting,running,completed,failed,successful,error,canceled&order_by=-finished',
url: GetBasePath('unified_jobs') + '?status__in=pending,waiting,running,completed,failed,successful,error,canceled,new&order_by=-finished',
searchParams: search_params,
spinner: false
});