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

20107 Commits

Author SHA1 Message Date
softwarefactory-project-zuul[bot]
d309acfddb
Merge pull request #3372 from beeankha/jt_strings2
Update fields.py to Display Correct Error Message When JT Credential Is Not an Integer

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-06 23:32:38 +00:00
beeankha
2196089216 Update fields.py to convert JT Credential input into integers 2019-03-06 18:05:53 -05:00
softwarefactory-project-zuul[bot]
658bdddac3
Merge pull request #3354 from ansible/404_test
404 validation

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-05 17:19:52 +00:00
Daniel Sami
bcdb590a29 404 tests for varied resources 2019-03-05 10:55:39 -05:00
softwarefactory-project-zuul[bot]
aad185e785
Merge pull request #3356 from marshmalien/feat-toolbar-sort-projects-list
Add toolbar sort to projects list

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-04 21:31:44 +00:00
softwarefactory-project-zuul[bot]
2934fabd98
Merge pull request #3357 from mabashian/jobs-list-socket-refresh
Fixes bug where jobs list search was lost on socket message

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-04 20:52:29 +00:00
mabashian
2359231bda Remove console.logs 2019-03-04 15:14:27 -05:00
mabashian
ca5f27aa9e Removes vm.querySet from jobs list and ensures that state params are updated when search is performed to prevent context loss on data refresh. 2019-03-04 15:11:54 -05:00
Marliana Lara
80adcaab81
Set sort dropdown to state param order_by value 2019-03-04 14:40:15 -05:00
Marliana Lara
8100fc1cfb
Add toolbar sort configuration to project list 2019-03-04 12:32:25 -05:00
Daniel Sami
006797014c fix url 2019-03-04 11:58:32 -05:00
Daniel Sami
38934dc8d0 lint fixes 2019-03-04 11:56:48 -05:00
Daniel Sami
0ec6d652f7 check for 404s 2019-03-04 11:53:35 -05:00
Marliana Lara
1525c6d97e
Extend Toolbar directive to include sort dropdown 2019-03-04 11:25:58 -05:00
softwarefactory-project-zuul[bot]
bf1769af6c
Merge pull request #3322 from mopahle/docker_install_ssl_default
Add SSL suport for docker install

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-01 19:54:05 +00:00
softwarefactory-project-zuul[bot]
6384e638f5
Merge pull request #3340 from AlexSCorey/3297-smartInventoryLabel
Add padding to label list tag.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-01 16:20:09 +00:00
Alex Corey
1df5e55a4e add padding to label list tag. 2019-03-01 10:56:08 -05:00
softwarefactory-project-zuul[bot]
d1005f91e7
Merge pull request #3174 from jbradberry/org_hosts_limit
[WIP] Org hosts limit

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-02-28 21:27:50 +00:00
softwarefactory-project-zuul[bot]
d9451ac12c
Merge pull request #3335 from AlexSCorey/3309-mgmtJobTitleStyling
Add margin to Management Jobs Notifications list

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-02-28 21:12:59 +00:00
mabashian
a82304765d Adds help text to host limit error shown in the output details of inventory sync jobs 2019-02-28 15:54:10 -05:00
mabashian
cc3f2e0819 Properly pass path to error message 2019-02-28 15:54:10 -05:00
mabashian
03c07c0843 Adds error handling to launch api calls 2019-02-28 15:54:10 -05:00
mabashian
1b94b616f0 Default empty max hosts to 0 2019-02-28 15:54:09 -05:00
mabashian
98c5cb1c4c Adds max value to host limit input 2019-02-28 15:54:09 -05:00
mabashian
ce5a85a53b Add support for max hosts on org 2019-02-28 15:54:09 -05:00
Jeff Bradberry
046385d72e Make the inventory_import command log an error message on exception
when it happens in the big try/except block in the middle of handle().
Previously it wasn't doing anything with it, except exiting with a
code of 1.
2019-02-28 15:54:09 -05:00
Jeff Bradberry
7eba55fbde Change the wording of the error when adding a host
to "Organization host limit of %s would be exceeded...", since the
host will probably not actually be made active.
2019-02-28 15:54:09 -05:00
Jeff Bradberry
6ac51b7b13 Update the permission error to include max_hosts and the current host count 2019-02-28 15:54:09 -05:00
Jeff Bradberry
97cc467ae1 Restrict edit permissions on the Organization.max_hosts field to superusers 2019-02-28 15:54:09 -05:00
Jeff Bradberry
3312ebcb05 Remove the hosts count from related_field_counts in the org api endpoints
It is probably not needed, and adds an additional db query.
2019-02-28 15:54:09 -05:00
Jeff Bradberry
4d06ae48d3 Deal with the (erroneous) case where a job is missing the inventory
by bailing out of check_org_host_limit early.  Validation catches this
situation later on.
2019-02-28 15:54:09 -05:00
Jeff Bradberry
cf75ea91a1 Properly use the inventory in the can_start permissions checks 2019-02-28 15:54:09 -05:00
Jeff Bradberry
5e34f6582b Tests for start permissions for JobTemplate and WorkflowJob
when max_hosts is set.
2019-02-28 15:54:09 -05:00
Jeff Bradberry
60008dbd74 Add a test that AWX doesn't care about max_hosts when editing hosts
on an inventory.
2019-02-28 15:54:09 -05:00
Jeff Bradberry
4afd0672a1 Add test that AWX doesn't care about the limit when creating new hosts 2019-02-28 15:54:09 -05:00
Jeff Bradberry
875a1c0b5f Remove the mention of the max_hosts value from the limit check messages 2019-02-28 15:54:09 -05:00
Jeff Bradberry
f5d7ca6913 Update the Organization API list and detail tests to check the host counts 2019-02-28 15:54:09 -05:00
Jeff Bradberry
df8a66e504 Correct the org limit check for changing hosts to use the host's org
instead of an inventory passed in from the user data, which is not allowed.
2019-02-28 15:54:09 -05:00
Jeff Bradberry
43a0a15f6f Expose the new InventoryUpdate.org_host_limit_error field in the API 2019-02-28 15:54:09 -05:00
Jeff Bradberry
36ed890c14 Add permissions checks for the organization host limit 2019-02-28 15:54:09 -05:00
Jeff Bradberry
0e8e5f65e1 Update to fix tests 2019-02-28 15:54:09 -05:00
Jeff Bradberry
6399ec59c9 Include in the API the count of hosts used by an organization 2019-02-28 15:54:09 -05:00
Jeff Bradberry
e44c73883e Expose Organization.max_hosts in the API 2019-02-28 15:54:09 -05:00
Jeff Bradberry
c3406748de Add the new fields to the database 2019-02-28 15:54:03 -05:00
Jeff Bradberry
6d70651611 Update the inventory_import management command
to respect the new Organization.max_hosts limit.
2019-02-28 15:51:50 -05:00
Jeff Bradberry
5e13da62a4 Added a max_hosts field to Organization
in order to optionally set a limit to the number of hosts an
organization that is sharing a license is allowed to manage.

related #1542
2019-02-28 15:51:50 -05:00
softwarefactory-project-zuul[bot]
658e5f0fc8
Merge pull request #3272 from jladdjr/mo_stats
Add support for new playbook stats

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-02-28 18:24:03 +00:00
softwarefactory-project-zuul[bot]
cebd918e49
Merge pull request #3331 from mabashian/IG-instances-modal
Fixes bug where all instances were preselected when modal was initially opened

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-02-28 14:30:43 +00:00
Alex Corey
a8c4e92804 Add margin to Management Jobs Notifications list 2019-02-28 09:17:27 -05:00
softwarefactory-project-zuul[bot]
dea71d2682
Merge pull request #3333 from ryanpetrello/more-py3-bugs
fix a few additional py3 issues

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-02-28 13:31:05 +00:00