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

7693 Commits

Author SHA1 Message Date
Alan Rominger
b0526cdd6a Merge pull request #2015 from AlanCoding/1997_AS_naming_bug
Fix ActivityStream naming mismatch bug
2016-05-26 15:21:41 -04:00
Akita Noek
4f6fd558a0 Merge pull request #2074 from anoek/test-fixes
Test fixes for slow tests
2016-05-26 14:48:45 -04:00
Akita Noek
fed8d49d86 Added optional "expect" arg for REST fixtures" 2016-05-26 13:58:26 -04:00
Akita Noek
aca858f5b2 Ported some old adhoc tests over to the new system 2016-05-26 13:58:16 -04:00
Akita Noek
5ea372ae43 Updated Job.limit expectation in old tests
See 821c43ba88d18feaded696e9994a9c5277a3195b
2016-05-26 13:58:08 -04:00
Akita Noek
aa49e071c6 Disabling RAX test until we get our cert issue figured out
Related to #1706
2016-05-26 13:57:55 -04:00
Alan Rominger
95ccdecf13 Merge pull request #2010 from AlanCoding/1999_see_your_own_JT_30
Automatically add JT creator to admin_role
2016-05-26 12:32:27 -04:00
kensible
6011b32ff4 Merge pull request #2058 from kensible/marketingChanges
Updated icons and default interface text for marketing
2016-05-26 11:49:34 -04:00
Akita Noek
11443eb22d Merge pull request #2060 from wwitzel3/3.0
Test refactoring
2016-05-26 11:23:56 -04:00
Wayne Witzel III
b8865c3749 make arguments to mk_ methods explicit 2016-05-26 11:02:09 -04:00
Wayne Witzel III
ec505f3f60 adjusting test and renaming helper 2016-05-26 11:02:07 -04:00
Wayne Witzel III
a6e97626ba README updates 2016-05-26 11:02:05 -04:00
Wayne Witzel III
1189ce033a fixing broken test cases 2016-05-26 11:02:04 -04:00
Wayne Witzel III
2052f93792 fixing function calls and None handling 2016-05-26 11:02:02 -04:00
Wayne Witzel III
c514cd44c3 restructure factories/fixtures and fix tests 2016-05-26 11:01:58 -04:00
Wayne Witzel III
fa010c2228 fix mk_label method 2016-05-26 11:01:57 -04:00
Wayne Witzel III
aaabc2582d refactored roles handling and added some more tests 2016-05-26 11:01:55 -04:00
Wayne Witzel III
4453e48729 updated factories docs 2016-05-26 11:01:53 -04:00
Wayne Witzel III
73e41ef6cc flake8 fixes 2016-05-26 11:01:52 -04:00
Wayne Witzel III
2f09c7fee1 added test for factory roles 2016-05-26 11:01:50 -04:00
Wayne Witzel III
3877804599 updated test to use new organization_factory 2016-05-26 11:01:48 -04:00
Wayne Witzel III
7ab385524d added roles support for organization_factory 2016-05-26 11:01:46 -04:00
Wayne Witzel III
becce311fe cleanup make methods and update asserts 2016-05-26 11:01:44 -04:00
Wayne Witzel III
bcef4a698c updating some tests to use new factories 2016-05-26 11:01:41 -04:00
Wayne Witzel III
0516ef02ca adding new factories 2016-05-26 11:01:39 -04:00
Graham Mainwaring
51dc42af2f Merge pull request #2054 from ghjm/release_3.0.0
Use correct PYTHONPATH when calling Ansible
2016-05-25 18:01:33 -04:00
Graham Mainwaring
6723a385f0 Fix PYTHONPATH to use the correct lib dir when using a venv from a different Python version 2016-05-25 16:51:21 -04:00
Shane McDonald
16fbe6cf7a Merge pull request #2053 from shanemcd/fix-docker-dev-container
Fix failing apt-key step in Dockerfile
2016-05-25 16:50:26 -04:00
Shane McDonald
0dc2b7426f Fix failing apt-key step in Dockerfile
The docs at https://wiki.postgresql.org/wiki/Apt are different than what we were doing. I tried this approach and it seems to be working now.
2016-05-25 16:46:45 -04:00
Akita Noek
085560567a Merge pull request #2037 from anoek/2032
Resurrect global .distinct() call (mostly)
2016-05-25 15:11:51 -04:00
Akita Noek
957eed5849 Merge pull request #2020 from anoek/migration-fixes
RBAC migration fixes
2016-05-25 12:30:53 -04:00
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
Akita Noek
19dcc06c9d Read permissions goes to read_role, not use_role
Dork.
2016-05-24 21:10:43 -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
Akita Noek
899ff8ed3b flake8 2016-05-24 13:19:55 -04:00
Akita Noek
81f093b1c0 Opt to rebuild all roles in helper method
This code was fine for the 0009 migrations since we introduced all roles
at once, however with changes in 0017 we can't just patch from the
roots, so this works generically without having to get fancy about
identifying which roles we need to actually update.
2016-05-24 12:46:43 -04:00
Akita Noek
8aa4df1b78 Fix job template migrations again
Eliminated some incorrect wtf filtering in permissions, and fixed up the
credential access checks.
2016-05-24 12:45:22 -04:00
Akita Noek
5dbce56beb When migrating, grant read_role instead of use_role appropriately
Only give read access to folks that didn't have explicit permissions to
use a project in a job template before.
2016-05-24 12:42:51 -04:00
Akita Noek
5eb67411a4 Rebuild role hierarchy after making changes in migrations
Signals don't fire in migrations, so gotta do this step manually
2016-05-24 12:38:25 -04:00
Akita Noek
a5bc62d7d4 enforce use_role access on both inventory and project when adding a JT 2016-05-24 12:37:44 -04:00
AlanCoding
9ed77508a7 fix naming problem with ActivityStream logging 2016-05-23 16:48:30 -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
AlanCoding
f695caf1ac auto associate JT creator with admin_role 2016-05-23 14:56:23 -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