1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

9087 Commits

Author SHA1 Message Date
Wayne Witzel III
9bad20cee3 do not allow assignment of system roles or user.admin_role to teams 2016-07-26 12:09:36 -04:00
kensible
69432e8586 Merge pull request #3113 from kensible/1798-select2-open-radius
Removed bottom border radius from open select2 dropdown
2016-07-26 08:22:35 -04:00
Leigh Johnson
97b4a800c1 remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058) 2016-07-25 17:39:19 -04:00
Leigh Johnson
136e1894f5 fix missing URI encoding in event summary serch, kickback on #2980 (#3050) 2016-07-25 17:39:19 -04:00
Matthew Jones
bfd037e00b Switch base class for StateConflict
This fixes the output format for the 409 exception return
2016-07-25 17:39:19 -04:00
Michael Abashian
95f461afb3 Fixed password show/hide on enter for survey maker password type previews 2016-07-25 17:39:19 -04:00
Michael Abashian
324b1f8902 Fixed password show/hide on enter for survey taker survey questions where type is password 2016-07-25 17:39:19 -04:00
Chris Church
1caa5d01b8 Prevent populate_user from being registered multiple times. 2016-07-25 17:39:19 -04:00
Jared Tabor
b3d3a6e590 Fixing iterator used when jobs list refreshes
it was still using the iterators used when there were four job panes
2016-07-25 17:39:19 -04:00
Matthew Jones
ebdf0e49b5 Explicit super user check for JT can_delete 2016-07-25 17:39:19 -04:00
Chris Church
574462b4f2 Fix for populating teams for LDAP user. 2016-07-25 17:39:19 -04:00
Matthew Jones
d3a541483c Fix up flake8 2016-07-25 17:39:19 -04:00
Michael Abashian
dfa42544a6 Rolled back the onExit solution previously implemented to handle the backspace navigation on the job launch modal. New solution listens for state changes within the directive and cleans itself up. 2016-07-25 17:39:19 -04:00
Matthew Jones
d389233b88 Switch disallowed object delete to 409
In the case of running job conflicts
2016-07-25 17:39:19 -04:00
Michael Abashian
4af8c98427 Password enter show/hide fix 2016-07-25 17:39:19 -04:00
Wayne Witzel III
633b27b66b add test for CustomInventoryScript serializer 2016-07-25 17:39:19 -04:00
Michael Abashian
48b31079af Fixed bug where hitting enter in a password field in the job launch/survey maker modal would toggle the show/hide. 2016-07-25 17:39:19 -04:00
AlanCoding
2d2b426374 add read_role to organization select_related 2016-07-25 17:39:19 -04:00
Wayne Witzel III
a801ee7d52 ensure system admin/auditor can see orphan inventory scripts 2016-07-25 17:39:19 -04:00
Michael Abashian
f0bfcd78d9 Merge pull request #3104 from mabashian/2299-completed-jobs-search
Completed Jobs search filters
2016-07-25 17:28:49 -04:00
James Laska
13bd9211ae Add copyright back with utf-8 encoding
Fixes encoding exception
2016-07-25 15:18:10 -04:00
James Laska
11d68d1ebe Complete Sat6 integration
Various fixes to get sat-6 integration working.

* inventory_import.py - the inventory script is called foreman.py
* tasks.py - be sure to call `add_section()` before using it
* defaults.py - Add various SATELLITE6_* enablement variables

Relates #3119
2016-07-25 15:13:39 -04:00
Matthew Jones
60e012f75b Force requests to emit application/json
When sending webhook notifications
2016-07-25 12:46:12 -04:00
Graham Mainwaring
30ed7b487b Merge pull request #3112 from ghjm/scl_install_rhel_rhsm
Enable software collections repo on RHEL 6 + RHSM
2016-07-25 12:22:35 -04:00
James Laska
f1c4a919bc Merge pull request #3117 from wwitzel3/3.0.1
fix issue with rbac_migrations logger
2016-07-25 12:15:53 -04:00
jlmitch5
e66a1606db Merge pull request #3102 from jlmitch5/fixWrapping
fix wrapping of name columns
2016-07-25 11:38:29 -04:00
Wayne Witzel III
81c4a82db8 fix issue with rbac_migrations logger 2016-07-25 11:22:50 -04:00
Alan Rominger
f5fa53d89a Merge pull request #3098 from AlanCoding/3033_AS_updates
Reorganize activity stream access around org admin/auditors (3.0.2)
2016-07-25 11:04:05 -04:00
Ken Hoes
f28e0fdc45 Removed bottom border radius from open select2 dropdown 2016-07-25 10:16:59 -04:00
Akita Noek
eeaa325b10 Merge pull request #3108 from anoek/3107
Fixed credential migration issue involving null inventory fields in job templates
2016-07-25 09:43:58 -04:00
Akita Noek
94052c2b2b Fixed credential migration issue involving null inventory fields in job templates
Don't attempt to derive credential organization information from a job
template when the inventory field is null for that job template

 #3107
2016-07-22 16:44:00 -04:00
John Mitchell
abd606e2c8 fixed word wrapping 2016-07-22 16:32:11 -04:00
Alan Rominger
4b3f1d44de Merge pull request #3105 from AlanCoding/new_job_cancel
Fixes for "new" job things in 3.0.1
2016-07-22 16:13:39 -04:00
AlanCoding
94c8dfd506 Allow instant cancel for new jobs 2016-07-22 15:49:24 -04:00
AlanCoding
4bea2aa627 Show new jobs in UI Jobs tab 2016-07-22 15:48:37 -04:00
Chris Meyers
7c16c8c6e7 Merge pull request #3103 from chrismeyersfsu/fix-travis_network_cred_test
fixes network cred failure in travis
2016-07-22 15:47:54 -04:00
Michael Abashian
b1b9767a95 Made type and name not searchable on the job templates completed jobs list 2016-07-22 15:45:31 -04:00
Chris Meyers
c7524892c0 fixes network cred failure in travis 2016-07-22 15:36:08 -04:00
Michael Abashian
6edc3abce2 Merge pull request #3094 from mabashian/2935-backspace-inv-cred-jt
awlookup timeout instead of GET with every keystroke
2016-07-22 15:11:45 -04:00
Chris Meyers
564aa86bd5 Merge pull request #3101 from chrismeyersfsu/fix-fact_version_get_param_ordering
fix travis
2016-07-22 15:08:03 -04:00
John Mitchell
03204f8dc0 fixed merge conflict 2016-07-22 15:01:58 -04:00
John Mitchell
22a96240a3 fix wrapping of name columns 2016-07-22 14:37:16 -04:00
Chris Meyers
37ddf2a4d9 fix unit test on travis 2016-07-22 14:00:28 -04:00
James Laska
2a791b8e90 Merge pull request #3099 from jlaska/tox
Add travis-ci integration using tox
2016-07-22 13:56:26 -04:00
James Laska
1f9df1fdf3 Default to not running old tests 2016-07-22 13:19:57 -04:00
James Laska
77202ec696 Only run unit and function tests 2016-07-22 13:19:57 -04:00
James Laska
29778538c3 Be sure to install ansible
Enable the mongodb travis service too
2016-07-22 13:19:57 -04:00
James Laska
6140c8c500 Additional travis/tox tweaks
* Enable travis caching
* Disable coverage after_build
* Call setup.py develop first
* Include pytest config and enable skipsdist
2016-07-22 13:19:57 -04:00
Shane McDonald
5c516b60b3 ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
2016-07-22 13:19:57 -04:00
James Laska
f3c186310b First pass at getting tox and travis working 2016-07-22 13:19:57 -04:00