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
AlanCoding
dba83674a2
fix task manager running task structures
...
- prevent dual-entry for first item in running jobs due to
setdefault syntax
- fix issue where queues (celery tasks) only returned the last
item in the inspector output due to looping problem
this caused reaper bugs in production
2017-09-21 14:38:58 -04:00
John Mitchell
25e503219f
tweaks to styling of capacity bar
2017-09-21 11:07:50 -04:00
Jared Tabor
44af8ac629
Merge pull request #446 from jaredevantabor/translations
...
Translations
2017-09-21 14:37:22 +00:00
Jared Tabor
4aa841f44b
Final fix for socket connection when emitting messages before connection is open
...
using setTimeout
2017-09-20 20:07:17 -07:00
Jared Tabor
28c1718965
tagging ON/OFF toggles for translations
2017-09-20 17:58:52 -07:00
Jared Tabor
557780bf08
adding translation tag for "No records matched your search"
2017-09-20 17:52:13 -07:00
Jared Tabor
d0cb11acb3
Merge pull request #444 from jaredevantabor/socket-fix
...
send last socket message if last socket didn't go thru due to socket …
2017-09-20 23:04:43 +00:00
John Mitchell
2306c34689
update instance capacity bar to be grey when instance or group is offline
2017-09-20 17:49:02 -04:00
Shane McDonald
1e03654c0b
Pull updated translations
2017-09-20 17:29:20 -04:00
Wayne Witzel III
7960525c20
Merge pull request #440 from wwitzel3/release_3.2.0
...
Merge pull request #224 from wwitzel3/fix-shared-deps
2017-09-20 16:50:08 -04:00
Alan Rominger
428eca1c35
Merge pull request #439 from AlanCoding/custom_hostvars
...
add back logic to re-call script for hostvars
2017-09-20 15:43:52 -04:00
Chris Meyers
0d08509e6d
Merge pull request #437 from chrismeyersfsu/fix-feature_cache
...
cache license validation
2017-09-20 14:00:44 -05:00
Chris Meyers
062ff7153d
resurrect cchurch's license feature caching
2017-09-20 14:57:24 -04:00
Wayne Witzel III
439beeab3b
Merge pull request #224 from wwitzel3/fix-shared-deps
...
Fix job shared dependencies.
2017-09-20 14:56:22 -04:00
Jared Tabor
0b1d8ccd92
send last socket message if last socket didn't go thru due to socket not open
2017-09-20 18:40:37 +00:00
Chris Meyers
c265ed2722
Revert "use request response cache for license checks"
...
This reverts commit 93acae9367023fec153aa7980f2edd9f96822ba2.
2017-09-20 13:47:44 -04:00
AlanCoding
80a944dd31
add back logic to recall script for hostvars
2017-09-20 13:20:04 -04:00
Alan Rominger
9db91b4344
Merge pull request #436 from AlanCoding/set_node_early
...
set execution_node right when jobs are accepted
2017-09-20 12:43:51 -04:00
AlanCoding
892ca98709
set execution_node right when jobs are accepted
2017-09-20 11:49:09 -04:00
Wayne Witzel III
c868f7e91f
Merge pull request #435 from wwitzel3/release_3.2.0
...
just fall through to the DjangoStrategy constructor
2017-09-20 09:02:58 -04:00
Wayne Witzel III
bab4cbbcf7
just fall through to the DjangoStrategy constructor
2017-09-20 08:50:39 -04:00
Jared Tabor
d31afdc749
Merge pull request #433 from jaredevantabor/socket-fix
...
using settimeout if socket.readyState = 0
2017-09-19 16:37:31 -07:00
