1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Commit Graph

14858 Commits

Author SHA1 Message Date
Matthew Jones
a5c028cd45 Merge pull request #477 from ansible/remove_callback_blocked_dependency
Remove the logic blocking dependent inventory updates on callbacks
2017-09-27 16:53:12 -04:00
Matthew Jones
3e38a0c17d
Add unit test for inventory_sources_already_updated 2017-09-27 16:52:05 -04:00
Christopher Wang
e8b45d3be1 Merge pull request #478 from mabashian/inv-completed-jobs-pagination-fix
Fixed inventory completed jobs pagination bug by setting default page size
2017-09-27 16:46:59 -04:00
Matthew Jones
f4c9617f95
Check for inventory sources already updated from start args
In the case where the host didn't exist in the inventory source and
was found in the first inventory sync
2017-09-27 16:31:22 -04:00
mabashian
8a8a064821
Fixed inventory completed jobs pagination bug by setting default page size 2017-09-27 16:11:35 -04:00
Marliana Lara
0b11a0d642 Merge pull request #475 from marshmalien/fix/remove-host-filter-import
Remove host-filter-modal import
2017-09-27 16:06:07 -04:00
Matthew Jones
7861cda6fe
Remove the logic blocking dependent inventory updates on callbacks 2017-09-27 16:00:05 -04:00
Marliana Lara
0eadd69934
Remove host-filter-modal import 2017-09-27 15:47:27 -04:00
Marliana Lara
a886747676 Merge pull request #473 from marshmalien/fix/7691-host-filter-modal-hover
Fix partial hover highlight of host filter modal row
2017-09-27 14:59:26 -04:00
Marliana Lara
d4d2f04fc3
Fix partial hover highlight of host filter modal row 2017-09-27 14:38:19 -04:00
Michael Abashian
1e9b5824a4 Merge pull request #472 from mabashian/7688-groups-pagination
Fixed nested groups pagination
2017-09-27 13:00:30 -04:00
Michael Abashian
dcdb094c92 Merge pull request #471 from mabashian/7676-smart-inv-related-search
Fixed host_filter searching related fields
2017-09-27 12:06:34 -04:00
mabashian
cfe8a6580b
Removed leading slash on basePath 2017-09-27 10:40:49 -04:00
mabashian
61b741030d
Fixed host nested groups pagination 2017-09-27 10:34:55 -04:00
mabashian
6c19bbb6de
Added trailing slash to basePath 2017-09-27 10:00:28 -04:00
mabashian
0193377d18
Fixed nested groups pagination 2017-09-27 09:54:00 -04:00
Wayne Witzel III
e233926a4a Merge pull request #467 from wwitzel3/release_3.2.0
add --comment-only option to the migrate_to_database_settings mgmt cmd
2017-09-26 19:07:46 -04:00
mabashian
1752a97315
Fixed host_filter searching related fields 2017-09-26 16:51:08 -04:00
Wayne Witzel III
ba23f1728a
add --comment-only option to the migrate_to_database_settings mgmt command 2017-09-26 14:51:59 -04:00
Alan Rominger
2ec675cf54 Merge pull request #465 from AlanCoding/retry_retry
broaden inventory deletion retry condition
2017-09-26 14:48:13 -04:00
AlanCoding
bfccd49a64
broaden inventory deletion retry condition 2017-09-26 10:45:30 -04:00
Aaron Tan
723f4b0a7a Merge pull request #463 from jangsutsr/7666-fix
Restore SAML enterprise user auth logic
2017-09-26 10:03:08 -04:00
Aaron Tan
9bae656676
Restore SAML enterprise user auth logic
Connect #7666 of ansible-tower and follow up original fix tower #455.
The original fix solves the problem of duplicated db keys, but breaks a
rule of enterprise users that 'Enterprise users cannot be
created/authenticated if non-enterprise users with the same name has
already been created in Tower.'. This fix resumes that rule.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
2017-09-26 09:51:42 -04:00
John Mitchell
a6e6298575
remove notice from unnecessary partials 2017-09-25 18:08:58 -04:00
Michael Abashian
8dae16bc98 Merge pull request #460 from mabashian/7675-jt-edit-permissions
Tweaked permissions logic to fix bug which prevented editing a JT without a default inv
2017-09-25 13:46:47 -04:00
Alan Rominger
4c0fd573c6 Merge pull request #459 from AlanCoding/special_treatment
always ignore deprecated_group if in groups
2017-09-25 13:35:55 -04:00
Alan Rominger
5bec43fc8e Merge pull request #462 from AlanCoding/bad_groups
handle additional cases of inv script output
2017-09-25 13:31:16 -04:00
Greg Considine
827cea53e4 Merge pull request #461 from gconsidine/ui/fix/wss-auth-token
Add quotes to auth token when stored as a cookie
2017-09-25 12:50:09 -04:00
John Mitchell
82b2fd102c
add disassociate message to other modals 2017-09-25 12:24:39 -04:00
AlanCoding
647d272a31
handle additional cases of inv script output 2017-09-25 12:20:21 -04:00
gconsidine
8fff5db758
Add quotes to auth token when stored as a cookie 2017-09-25 11:45:52 -04:00
mabashian
37003a52cf
Tweaked permissions logic to fix bug which prevented editing a JT without a default inv 2017-09-25 11:35:03 -04:00
AlanCoding
a4a17fe14c
always ignore deprecated_group if in groups
If overwrite=True for an inventory source import, then this matters
creating a new inventory source through v1 API will not include
deprecated_group inside of the InventorySource groups m2m related
connection, but migrations from 3.1 will

In those migrated cases, this code will leave the deprecated_group
untouched, so as to not trigger its cascade delete
2017-09-25 11:22:12 -04:00
Greg Considine
2ad26008cc Merge pull request #458 from gconsidine/ui/fix/login-auth-token
Fix login and authorization token errors
2017-09-25 10:14:47 -04:00
Michael Abashian
c9ce751bf0 Merge pull request #447 from jaredevantabor/socket-fix
Final Socket Fix!
2017-09-25 10:09:08 -04:00
gconsidine
4ad2af30cf
Fix login and authorization token errors
* Remove extraneous quotes when authroization token is retrieved
from a cookie
* Fix thrown error when invalid creds are supplied on login due to
attempt to access property of an undefined value
2017-09-22 17:58:16 -04:00
John Mitchell
0bb7b0700d
changed popover help text for overwrite sources 2017-09-22 17:31:28 -04:00
Wayne Witzel III
0b0afe91ab Merge pull request #457 from wwitzel3/release_3.2.0
get_or_create already saves, no need to call again
2017-09-22 16:42:47 -04:00
Wayne Witzel III
39cc427668
get_or_create already saves, no need to call again 2017-09-22 16:25:55 -04:00
Wayne Witzel III
9e9692971f Merge pull request #455 from wwitzel3/release_3.2.0
Various SAML / auth fixes.
2017-09-22 16:10:49 -04:00
Wayne Witzel III
e9e027ecd7
Fix issue when the enterprise_auth has already been created 2017-09-22 15:58:39 -04:00
Wayne Witzel III
723449818d
Fix issue when per user tokens are disabled 2017-09-22 15:58:26 -04:00
jlmitch5
b2b45ddeda Merge pull request #443 from jlmitch5/instanceCapacityBarOffline
update instance capacity bar to be grey when instance or group is off…
2017-09-22 13:46:52 -04:00
John Mitchell
46eb1727ad
add tooltip 2017-09-22 10:07:51 -04:00
Jared Tabor
a2e947ff70 turning off debug mode 2017-09-21 20:17:54 -07:00
Chris Meyers
bc7640e4ac Merge pull request #450 from chrismeyersfsu/fix-feature_cache2
2-level memoize
2017-09-21 16:37:16 -04:00
Alan Rominger
186d61aac4 Merge pull request #448 from AlanCoding/more_task_mgr_fixing
fix task manager running task structures
2017-09-21 16:27:32 -04:00
Chris Meyers
26d393e5c2 2-level memoize
* Allows for invalidating an entire function from the memoizer
2017-09-21 15:34:51 -04:00
Ryan Petrello
a298f797b5 Merge pull request #449 from ryanpetrello/fix-7668
fix a bug that causes azure inventory syncs w/ region='all' to fail
2017-09-21 15:17:32 -04:00
Ryan Petrello
328b70ceb8
fix a bug that causes azure inventory syncs w/ region='all' to fail
see: https://github.com/ansible/ansible-tower/issues/7668
2017-09-21 15:08:54 -04:00