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

7291 Commits

Author SHA1 Message Date
Leigh
1d22324c97 Merge pull request #1769 from leigh-johnson/ScheduleFormCancel
Fix alignment of generic schedules / mgmt schedules form cancel button
2016-05-03 09:48:46 -04:00
Leigh Johnson
1199ba1020 fix form cancel alignment in gen schedules / mgmt schedules templates, resolves #1720 2016-05-03 00:07:59 -04:00
Leigh Johnson
5f040640fd Merge branch 'leigh-johnson-GroupBadges' into devel 2016-05-02 23:32:29 -04:00
Leigh Johnson
484106ccf2 resolve a merge conflict in PR #1709 2016-05-02 23:31:56 -04:00
Jared Tabor
5c02b2dafe Remove route resolves from login/logout routes
Was previously using wrong route names.
2016-05-02 13:12:34 -07:00
Matthew Jones
9cc9ef6b33 Use shallow copy in fact cache plugin
This deep copy would cause ansible-playbook to get hung up and fail to
spawn new subprocesses thus forcing extremely large scan jobs to
serialize their connections through one process.    This had the effect
of forcing `forks=1` behavior.

This change was for citco, a customer who is running scan jobs against
600 hosts with a forks value of 200.
2016-05-02 13:34:47 -04:00
Jared Tabor
55c230f428 Merge pull request #1751 from jaredevantabor/resolvers
Removing the FeatureService from state resolve files
2016-05-02 09:08:01 -07:00
Wayne Witzel III
573bc07c5d Merge pull request #1738 from wwitzel3/issue-1714
prevent a user from removing their own admin_role
2016-05-02 10:09:41 -04:00
Wayne Witzel III
18e42d442e Merge pull request #1734 from wwitzel3/team-roles-access
ensure change access for adding team roles
2016-05-02 10:09:08 -04:00
Wayne Witzel III
86ea6b115f Merge pull request #1739 from wwitzel3/issue-1531
fixing non-unique query combining
2016-05-02 10:08:18 -04:00
kensible
788f185632 Merge pull request #1746 from kensible/1644-editNewResources
Redirect to edit and listing after job template creation, fixed creation error
2016-05-02 08:42:54 -04:00
Jared Tabor
459fb492f3 Removing the FeatureService from state resolve files
Instead, the FeatureService can be added into hte resolve in the StateExender provider
2016-04-29 16:10:03 -07:00
Akita Noek
45a3ccaa50 Merge pull request #1743 from anoek/migration-fixes
RBAC Migration fixes
2016-04-29 16:08:03 -04:00
Akita Noek
6427526686 Updated JT migration tests to be more correct
This test was passing before because we were erroneously making all
users organization auditors, which gave users read access to all JT's
under the org.
2016-04-29 15:34:54 -04:00
Leigh
f2f6230818 Merge pull request #1741 from leigh-johnson/InventoryManageHosts
Refactor Inventory > Manage > Hosts > Add/Edit, update Hosts list on Group selection
2016-04-29 15:34:26 -04:00
Ken Hoes
2897ca8e23 Redirect to edit and listing after creation, fixed creation bug 2016-04-29 13:49:15 -04:00
Alan Rominger
293db554c5 Merge pull request #1662 from AlanCoding/1407_credential_post_fields_rebased
Allow credentials to be created in UI touch up documentation for owners
2016-04-29 12:33:59 -04:00
Jared Tabor
b27e84e805 Merge pull request #1703 from jaredevantabor/inv_sync_schedules
Adding scheduler for inventory syncs
2016-04-29 09:25:24 -07:00
John Mitchell
eb0c8f389b fix saving of new jts error 2016-04-29 10:11:00 -04:00
John Mitchell
06f157b2c9 fix ternary that was hiding the search and action buttons for related lists 2016-04-29 09:59:28 -04:00
Leigh Johnson
26a8d7826d reload Hosts list when a Group is selected, resolves #1708 2016-04-28 20:36:29 -04:00
Leigh Johnson
8c6745d383 refactor Inventories > Manage > Hosts to support headerFields, add enabled/disabled toggle, resolves #1725 #1599 2016-04-28 19:48:53 -04:00
Wayne Witzel III
47561978d2 fixing non-unique query combining 2016-04-28 16:11:12 -04:00
Wayne Witzel III
1e432126cd prevent a user from removing their own admin_role 2016-04-28 15:39:56 -04:00
Wayne Witzel III
ef8eb712c6 added tests to assert team roles attach/unattach permissions, removed previous flawed fix 2016-04-28 15:15:26 -04:00
jlmitch5
4e32e905d9 Merge pull request #1728 from jlmitch5/uiLicenses
added licenses for new client side libraries
2016-04-28 13:51:51 -04:00
Wayne Witzel III
b6bbd4fa77 ensure change access for adding team roles 2016-04-28 13:43:49 -04:00
Akita Noek
ac1503e55c Fixed org migrations.. users are 'members' not 'auditors' 2016-04-28 11:50:36 -04:00
Jared Tabor
c2c3c7ebf4 cleaning up hint error 2016-04-28 08:50:18 -07:00
Jared Tabor
90c6e1ca36 Fixing extra vars for inv-sync schedules and projects 2016-04-28 08:41:04 -07:00
Jared Tabor
f1545860f0 Adding scheduler for inventory syncs
which can be found in the groups panel on the left side of hte inventory manage page in the row for each group.
2016-04-28 08:41:04 -07:00
John Mitchell
5aeb2e37bf added licenses for new client side libraries 2016-04-28 11:40:21 -04:00
Graham Mainwaring
72b80457eb Merge pull request #1718 from ghjm/supervisord_hang
Fixes systemctl/supervisord hang on first boot
2016-04-28 10:58:56 -04:00
jlmitch5
f360b33389 Merge pull request #1711 from jlmitch5/relatedUsersTeams
Fixed related lists for users and teams edit
2016-04-28 10:58:50 -04:00
Akita Noek
110a500938 Merge pull request #1723 from anoek/activity-stream-delete-fix
Fixed and updated activity stream delete operations
2016-04-28 10:43:30 -04:00
Akita Noek
27a7cf0d88 Added an explicit save everything step in the rbac migration
This step ensures all of our roles get setup before we start the
migration. It also speeds things up a little as we can wrap everything
with a `with batch_role_ancestor_rebuilding()`. We were pretty much
doing this already, but we had an issue where we didn't catch all job
templates all the time, so this just makes it very explicit and ensures
everything is setup, and does so a little faster.
2016-04-28 10:37:15 -04:00
AlanCoding
a2c2ccab20 credential owner fields changed to PK related field to solve 1671 2016-04-28 10:16:37 -04:00
Akita Noek
951d728472 Fixed and updated activity stream delete operations
Switched to using pre_delete instead of post_delete to record activity
stream delete operations so we have access to all of the fields that may
be associated with the field (eg things that may be being deleted with
this object through a cascade delete).

Switched to recording the full dict of the object instead of a diff
(since the diff will always be empty).
2016-04-28 09:49:26 -04:00
Akita Noek
c9501ad556 commented out code cleanup 2016-04-28 09:39:18 -04:00
Akita Noek
af4daec314 More RBAC migration fixes 2016-04-27 16:59:33 -04:00
Leigh
521e0645a2 Merge pull request #1716 from leigh-johnson/AddEditGroupsFix
Fix Add/Edit Groups broken by bad merge conflict in rev 14d956c132889690580d7c92f7ccd
2016-04-27 16:47:05 -04:00
Wayne Witzel III
7e482cdb36 Merge pull request #1719 from wwitzel3/issue-1699
change inventory error warning
2016-04-27 16:44:21 -04:00
Wayne Witzel III
78148da55c change inventory error warning 2016-04-27 16:31:03 -04:00
Alan Rominger
fcd82c87be Merge pull request #1705 from AlanCoding/1696_cred_start
Change access.py to disallow launching without credential
2016-04-27 16:26:03 -04:00
AlanCoding
d5a3951d52 break up test into 2, isolating context 2016-04-27 15:58:16 -04:00
John Mitchell
85aee6af8c added deletion to permissions lists 2016-04-27 15:35:37 -04:00
AlanCoding
4af1e0a9bf remove additional resource creation in test context 2016-04-27 15:30:51 -04:00
Akita Noek
b670681f6c Handle JT "create" permissions during migration 2016-04-27 15:28:17 -04:00
Akita Noek
a6f735b4b9 Fixed call to role rebuilder during migrations 2016-04-27 15:27:52 -04:00
AlanCoding
a7311a69c9 runtime test fixtures organized better 2016-04-27 14:24:54 -04:00