External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 05:31:22 -03:30
Code Issues Packages Projects Releases Wiki Activity
7,652 Commits 54 Branches 19 Tags
Commit Graph

7652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek
1abba522b0 Resurrect global .distinct() call (mostly) 
This mostly reverts 3c67971e78a12bd94536aa5464f0bc1ea46ba1ee with
the minor difference that we only apply this when we're filtering,
which is apparently necessary without some notable overhaul since
the filtering we're doing will get stuck in as filters, which will
generate inner joins, which can result in duplicates if the thing
we're joining with is a one to many or many to many, which most
things are.

With this patch we still need to be generating naturally distinct
querysets with any `get_queryset` methods, which will still be much
more effecient when filtering is not involved.

This fixes #2032 and probably a bunch of other undiscovered issues.
 2016-05-24 22:19:51 -04:00
Leigh
bef61f4003 Refactor Inventories > Inventory Manage module (#2013) 
* refactor InventoryManage modules, resolves #1748, #1354, #1754, #1960, #1961, #1962, #1963, #1965

* refactor InventoryManage modules, resolves #1748, #1354, #1754, #1960, #1961, #1962, #1963, #1965

* instantiate lookupfields with correct values / endpoint queries #1979

* fix groups/host list sort and remove some unnecessary service abstractions #1979

* fix childless delete wording

* add host > toggle enabled/disabled

* fix breadcrumb indexing

* remove extra required asterisk from inventory script lookup field

* fix delete prompt styling

* remove group badge linking, add toolip

* full width host var form, fix add/edit group inventory source vars

* restrict copy/moving multiselect to one item

* break word on host/group names and support multiple rows of breakcrumbs

* hide trailing breadcrumb slash at root group view

* fix failing unit test dependency path, hook up system tracking

* fix ec2 group by label rendering in group > edit view, fix add/edit/adhoc breadcrumb display when breadcrumbs are 2+ rows

* fix select spacing on copy/move groups

* limit group/host/copyMove search to current context

* refresh status icons on page/search event

* move status indicators to left side of lists

* fix typo in select2 init

* fix assorted typos

* $track by statement needs to tail | filterBy:xyz

* fix JSHint failure

* PR feedback, hook up filter for hosts with active failures, hook up status tooltips/popovers
 2016-05-24 19:16:00 -04:00
Michael Abashian
0f742fb7a7 Merge pull request #2014 from mabashian/survey-maker-height 
Survey Maker Question Type Double Scroll Fix
 2016-05-23 15:45:58 -04:00
Michael Abashian
7a6c5f3c87 Give the question portion of survey-maker a minimum height so that the type dropdown has enough space and doesn't result in double scrolling. 2016-05-23 14:05:52 -04:00
Michael Abashian
ffc7364097 Merge pull request #2011 from mabashian/survey-button-3.0 
Move Add/Edit Survey button location
 2016-05-23 11:14:27 -04:00
Michael Abashian
3739425eb7 Moved survey buttons down beside save/cancel on job template forms 2016-05-23 10:28:48 -04:00
Graham Mainwaring
cb6b57aa75 Merge pull request #2003 from ghjm/bytecompile_fixes 
Pick the correct interpreter when bytecompiling
 2016-05-20 16:00:33 -04:00
Akita Noek
3425c1d4d1 Merge pull request #2000 from anoek/1503 
Disable custom inventory script input when you have no access
 2016-05-20 15:54:24 -04:00
Graham Mainwaring
d21a29e404 Merge pull request #1978 from ghjm/remove_oracle_workaround 
Remove OL6 yum workaround
 2016-05-20 15:53:06 -04:00
Akita Noek
a276b9271d Merge pull request #2001 from AlanCoding/1998_inv_prompted_jt 
All non-superusers to create prompted JTs
 2016-05-20 15:52:41 -04:00
Akita Noek
1bf50e95b0 Merge pull request #2002 from AlanCoding/fix_inv_use_role 
Cleanup stray exec -> use role for inventory list
 2016-05-20 15:39:08 -04:00
Graham Mainwaring
9a17e0230c Pick the correct interpreter when bytecompiling 2016-05-20 15:38:12 -04:00
AlanCoding
3f63172ac4 inventory exec role changed to use 2016-05-20 15:36:00 -04:00
AlanCoding
dfec286bed All non-superusers to create prompted JTs 2016-05-20 15:30:58 -04:00
Akita Noek
4e9e341819 Disable custom inventory script input when you have no access 
Also show 'Script contents hidden'

 #1503
 2016-05-20 14:53:36 -04:00
Akita Noek
df62b85a2f Merge pull request #1996 from anoek/1959 
Executed the inventory execute_role
 2016-05-20 14:29:22 -04:00
Akita Noek
fd9c96aa80 Executed the inventory execute_role 
Replaced with the 'use_role', which is now useful.

 Completes #1959
 2016-05-20 14:10:29 -04:00
Ken Hoes
17272fec05 Merge branch 'kensible-1831-auditGlobal+953' into devel 2016-05-20 13:48:24 -04:00
Ken Hoes
e56f35efee Fixed merge conflicts 2016-05-20 13:48:11 -04:00
Akita Noek
2648265711 Merge pull request #1991 from anoek/1932 
Fix access list to return complete team role list
 2016-05-20 13:34:26 -04:00
Akita Noek
b13870fd29 Merge pull request #1987 from anoek/1986 
Split permissions list into two columns
 2016-05-20 13:33:54 -04:00
Akita Noek
e98dc484a7 Merge pull request #1984 from anoek/1955 
Show selected playbook in JT's even if you can't read the project
 2016-05-20 13:33:47 -04:00
Akita Noek
89be33dac1 Merge pull request #1983 from anoek/noselect 
Don't allow text selection on checkbox labels nor buttons
 2016-05-20 13:33:38 -04:00
Akita Noek
ba19e0e105 Merge pull request #1975 from anoek/auditor-support 
Add support for creating system auditors
 2016-05-20 13:33:21 -04:00
Matthew Jones
7514ed389a Don't trim whitespace from customer inv scripts 2016-05-20 13:30:10 -04:00
Bill Nottingham
5786c33590 Merge pull request #1989 from wenottingham/stdout-tweak 
Don't refer to a different page for stdout - it's on the same page now.
 2016-05-20 12:03:18 -04:00
Akita Noek
10cb04ae80 Fix access list to return complete team role list 
We were just returning the first element before, dur.

 Fixes #1932
 2016-05-19 16:37:06 -04:00
Bill Nottingham
1823032f3c Don't refer to a different page for stdout - it's on the same page now. 
Related to #1557.
 2016-05-19 16:05:37 -04:00
Akita Noek
150c98de18 Merge pull request #1988 from anoek/1919-v2 
Text update for team role removal confirmation message
 2016-05-19 14:47:24 -04:00
Akita Noek
741c6a0cfd Text update for team role removal confirmation message 
#1919
 2016-05-19 14:46:35 -04:00
Akita Noek
1d8f69c156 Split permissions list into two columns 
One for user perms and one for team permissions

 #1986
 2016-05-19 14:32:13 -04:00
Akita Noek
49b88dd646 Hide the user type selection for non super users 
Completes UI portion of #1974
 2016-05-19 13:34:51 -04:00
Michael Abashian
bd8ce603fd Merge branch 'mabashian-job-launch-modal-overhaul' into devel 2016-05-19 13:22:41 -04:00
Michael Abashian
e373316df0 Merge branch 'job-launch-modal-overhaul' of https://github.com/mabashian/ansible-tower into mabashian-job-launch-modal-overhaul 
# Conflicts:
#	awx/ui/client/legacy-styles/forms.less
 2016-05-19 13:22:05 -04:00
Akita Noek
23e7e12a04 Support creating system auditors through all 4 of our user creation endpoints 2016-05-19 13:07:58 -04:00
Akita Noek
e6322baf20 Show selected playbook in JT's even if you can't read the project 
#1955
 2016-05-19 12:08:46 -04:00
Matthew Jones
31f05a45cd Merge pull request #1971 from matburt/job_stdout_backup 
Add backup and restore tasks for job stdout
 2016-05-19 11:17:10 -04:00
Akita Noek
01a2590271 Don't allow text selection on checkbox labels nor buttons 
Prevents annoying random text selection when you're clicking through
things.
 2016-05-19 11:02:43 -04:00
Michael Abashian
da7d77eb08 Survey textarea should have Form-textArea class. Fixed various extra vars bugs dealing with code mirror. 2016-05-19 10:51:35 -04:00
Akita Noek
aa9a4925b0 Fix annoying warning message related to license info not loading appropriately 
Log it into the console though.

This shouldn't be necessary after #1763 lands, but isn't a bad thing to
be doing in general.
 2016-05-19 10:03:42 -04:00
Akita Noek
727dc580c7 Merge pull request #1968 from wwitzel3/issue-1938 
adds related `roles` for InventoryScript
 2016-05-19 09:25:53 -04:00
kensible
a3ab3f85e9 Merge pull request #1973 from kensible/1940-formButtons 
Confirm/proceed action on right, cancel on left
 2016-05-19 09:21:35 -04:00
Akita Noek
9dc662e3b2 Merge pull request #1972 from wwitzel3/issue-1890 
ensure superusers can still see JTs even if proj/inv/org are deleted
 2016-05-19 09:17:58 -04:00
Akita Noek
e8a3e7456d Merge pull request #1944 from wwitzel3/issue-1910 
Fix access to JT for admin and superuser
 2016-05-19 09:17:29 -04:00
Akita Noek
9fba513c4f Protect against bad posts, fixes some test cases 2016-05-18 17:01:38 -04:00
Michael Abashian
c31f53517c Fixed various bugs dealing with styling of inputs, prompting for variables and converting extra vars from yaml/json and vice-versa. 2016-05-18 16:55:14 -04:00
Akita Noek
49a2f6b535 Default is_system_auditor to False in serializer for API compatibility 2016-05-18 16:50:52 -04:00
Akita Noek
9e562deb0c Copy paste error 2016-05-18 16:50:43 -04:00
Akita Noek
58f142e2e6 Update user add/edit UI to support System Auditor setting 
Also moved the LDAP indicator to be inline with the mockups (bubble next
to the uesrname in the upper left)

 #1937
 #1888
 2016-05-18 16:08:36 -04:00
Alan Rominger
c158c9dfe3 Merge pull request #1943 from AlanCoding/863_activity_stream_sorting 
Implement a default ordering for ActivityStream
 2016-05-18 16:07:19 -04:00