shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity
6,910 Commits 40 Branches 19 Tags 380 MiB
4950db8ac9
Commit Graph

6910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III
4950db8ac9 remove tests that are no longer valid 2016-04-13 11:41:15 -04:00
Wayne Witzel III
c0b5fafafe read-only view /organization/<id>/projects 2016-04-13 11:39:14 -04:00
Michael Abashian
3e479d5602 Merge pull request #1449 from mabashian/survey-rework 
Create/edit survey re-work
 2016-04-13 07:44:12 -04:00
Jared Tabor
eee91eea86 Merge pull request #1451 from jaredevantabor/notifications 
Adding notifications into the UI
 2016-04-12 16:11:13 -07:00
Matthew Jones
28ffa57258 Implement rbac and related unit tests for notifications 2016-04-12 17:00:38 -04:00
Akita Noek
40731f6fc8 Merge pull request #1513 from anoek/1499 
Fix erronous singleton role created for users
 2016-04-12 16:54:19 -04:00
Akita Noek
3f0ea18e10 Merge pull request #1516 from anoek/devel 
Fix bad migration from #1496
 2016-04-12 16:52:38 -04:00
Akita Noek
1d27ddc7d2 Fix bad migration from #1496 2016-04-12 16:50:54 -04:00
Akita Noek
2ccd46de11 Merge pull request #1511 from anoek/explicit-implicit-parents 
Switch to explicitly stored implicit role parents
 2016-04-12 16:34:10 -04:00
Akita Noek
d6d8390f8c Merge pull request #1480 from anoek/migration 
Migration fixes
 2016-04-12 16:33:54 -04:00
Akita Noek
caab5b7e20 Merge branch 'migration' into explicit-implicit-parents 2016-04-12 16:31:51 -04:00
Akita Noek
ad89491a07 Fixed bad merge 2016-04-12 16:31:11 -04:00
Akita Noek
ea3a7ef227 Merge branch 'devel' of github.com:ansible/ansible-tower into migration 2016-04-12 16:30:09 -04:00
Wayne Witzel III
6bc765d1b5 Merge pull request #1507 from wwitzel3/rbac-bug-1422 
RBAC Job Fixes
 2016-04-12 16:22:47 -04:00
Akita Noek
a0356afbac Improved code clarity and UI naming for user owner role creation 
#1499
 2016-04-12 16:11:45 -04:00
jlmitch5
e3ebbab17d fix list label of status 2016-04-12 15:58:17 -04:00
Jared Tabor
62ecefb716 removing unncessary line 2016-04-12 12:55:01 -07:00
Jared Tabor
462eb19087 Changing ngToast success color 2016-04-12 12:55:01 -07:00
Jared Tabor
de56747d1c Cleaning up code from PR feedback 2016-04-12 12:55:00 -07:00
Jared Tabor
72ae8f46c9 Adding notifications into the UI 2016-04-12 12:55:00 -07:00
Akita Noek
c984b33f1e Fix erronous singleton role created for users 
Needed to be just a normal role, ie with `name` assigned instead of
`singleton_name`

 Addresses #1499
 2016-04-12 15:43:27 -04:00
Akita Noek
563917a217 Merge pull request #1509 from anoek/devel 
Fix faulty activitystream test
 2016-04-12 15:41:25 -04:00
Akita Noek
1369be8f17 Merge branch 'devel' into explicit-implicit-parents 2016-04-12 15:13:37 -04:00
Akita Noek
29c7ecf6a8 Merge branch 'devel' into migration 2016-04-12 15:12:43 -04:00
Akita Noek
8c917de24d Fix faulty activitystream test 
Test assumed that the only entry in activitystream would be related to
the creation of the organization, which in this case was not true, the
most recent being something related to the user object being created or
modified.
 2016-04-12 15:03:24 -04:00
Akita Noek
6039ad92e9 Merge branch 'devel' of github.com:ansible/ansible-tower into explicit-implicit-parents 2016-04-12 14:51:30 -04:00
Akita Noek
7b4e7ec5b3 Switch to explicitly stored implicit role parents 
Completes #1496
 2016-04-12 14:50:52 -04:00
Akita Noek
7e0bfc9831 Use --nomigrations for py.test 
This is for two reasons, 1) it's a lot faster when starting from a new
database, and 2) since we do database work within our migrations, it
doesn't actually work within py.test, which is either a bug in
pytest-djano, or a horrible behavior of pytest-django.
 2016-04-12 14:32:10 -04:00
Wayne Witzel III
7cd4fb7b7a Merge pull request #1502 from wwitzel3/rbac-feature-1324 
Update docs, driveby test fix.
 2016-04-12 13:32:56 -04:00
Wayne Witzel III
e5b9766c8f Update Job start / access permissions 2016-04-12 13:28:03 -04:00
Chris Meyers
69812fc8ab Merge pull request #1490 from chrismeyersfsu/fix-labels_unique 
cascade delete labels
 2016-04-12 13:09:26 -04:00
Akita Noek
b77d8dab47 flake8 fixes 
Signed-off-by: Akita Noek <anoek@ansible.com>
 2016-04-12 12:04:39 -04:00
Shane McDonald
629c46fb0c Merge pull request #1501 from shanemcd/fix-ami-install-script 
Make Packer inventory consistent with setup/inventory
 2016-04-12 11:51:24 -04:00
Akita Noek
e9aff8d67d Moved necessary add field migration to exist prior to dependent implicit role field which references the field 2016-04-12 11:40:17 -04:00
Akita Noek
74d86859f1 Fix project migration when project has exactly one org 2016-04-12 11:40:17 -04:00
Akita Noek
5f8e7bbf55 Replace user.admin_role usage with manual version that works in migrations 2016-04-12 11:40:17 -04:00
Akita Noek
86e29221d5 Fixed missing orgfunc usage to resolve organization during credential migration 2016-04-12 11:40:17 -04:00
Akita Noek
59b6ed3b9c Update rbac schema migrations so we have all parameters we need to operate during a migration 
We need all those rbac fields definied in the migration in order for the
current apps to have access to them during a migration.
 2016-04-12 11:40:17 -04:00
Akita Noek
e3a45235a6 Do an initial save on all resources during amigration to force the creation of RBAC role objects. 2016-04-12 11:40:17 -04:00
Akita Noek
7d2e660749 Make use of 'current' apps so RBAC ImplicitRoleField can work during migrations 
While a migration is taking place, we can't juse use normal model
references like Role and RolePermission, nor can we use generic foreign
keys without manually referring to the content type and object id
fields.
 2016-04-12 11:40:17 -04:00
Akita Noek
682552d9b0 Added field deconstruct method so ImplicitRoleField works in migrations 
Apparently we need this, who'da known.
https://docs.djangoproject.com/en/1.9/howto/custom-model-fields/
 2016-04-12 11:40:17 -04:00
Akita Noek
274744b4c1 Replaced Role.singleton usage in migrations as it doesn't exist here apparently 2016-04-12 11:40:17 -04:00
Akita Noek
ec439126e0 Added created/modified and another content_object fix in our migrations 
#1380 #1425
 2016-04-12 11:40:17 -04:00
Akita Noek
b1c568e4d9 Fix invalid usage of content_object during migrations 
#1380
 #1425
 2016-04-12 11:40:17 -04:00
AlanCoding
98dd79775b series of tests to verify user executing permissions 2016-04-12 11:37:33 -04:00
Wayne Witzel III
558311eaed Fixup inventory test 2016-04-12 11:29:59 -04:00
Matthew Jones
b4ef0304e3 Add funcsigs as a direct dependency for the venvs 2016-04-12 10:48:49 -04:00
Wayne Witzel III
476c43f7a7 Resource fixes 
The idea of a resource is an abstract one using Generic Foreign Key and not a concrete one with a model.
 2016-04-12 10:38:24 -04:00
Chris Meyers
0d0115ef5e include migration 2016-04-12 10:23:43 -04:00
Wayne Witzel III
a244af5360 Update Role model method docs. 2016-04-12 10:11:38 -04:00