Akita Noek
1d27ddc7d2
Fix bad migration from #1496
2016-04-12 16:50:54 -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
jlmitch5
e3ebbab17d
fix list label of status
2016-04-12 15:58:17 -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
7b4e7ec5b3
Switch to explicitly stored implicit role parents
...
Completes #1496
2016-04-12 14:50:52 -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
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
Chris Meyers
0d0115ef5e
include migration
2016-04-12 10:23:43 -04:00
Akita Noek
18dea2203f
Removed unnecessary rebuild_role_ancestor_list call in a test
2016-04-12 09:55:20 -04:00
Akita Noek
dc70262d39
Merge pull request #1435 from anoek/user-activity-stream-updates
...
Added activity stream events for User
2016-04-12 09:10:52 -04:00
Akita Noek
ecedf491a4
Removed erroneous sso login error log
...
The log message here does not indicate a login failure at all, in fact
it doesn't appear like we get a login failed message, they just don't
get authed.
2016-04-11 23:17:10 -04:00
Akita Noek
c4a1f55f53
Merge pull request #1414 from anoek/access-list-updates
...
Updated access_list to include team information for indirect access
2016-04-11 17:04:53 -04:00
Akita Noek
24a841a0bf
Added sso login logging
...
Part of #1087
This is untested as we need to have a public facing machine to do SSO
stuff against.
2016-04-11 17:03:04 -04:00
Akita Noek
f3cae7e1f0
Log basic auth requests to the debug log
...
Part of #1087
2016-04-11 17:03:04 -04:00
Akita Noek
6182dad0d4
Added activity stream events for User
...
Completes development for #1087
2016-04-11 17:03:04 -04:00
Wayne Witzel III
12b1068ed4
fix open_fifo_write call
2016-04-11 16:23:06 -04:00
Chris Meyers
5bf83e8b64
cascade delete labels
2016-04-11 16:02:42 -04:00
Wayne Witzel III
5154e19565
Merge pull request #1484 from wwitzel3/invsrc-cred-migration
...
add migrations for invsource and credentials
2016-04-11 15:03:49 -04:00
John Mitchell
d5fb4b306d
fixes based on search tags permissions breakage
2016-04-11 15:02:35 -04:00
Wayne Witzel III
992521e040
add migrations for invsource and credentials
2016-04-11 15:00:58 -04:00
Matthew Jones
d6c2b931f9
Remove stray comma from network credential in JobOptions
2016-04-11 14:49:23 -04:00
jlmitch5
b946a6d871
Merge pull request #1454 from jlmitch5/configureRBACUI
...
configure rbac for creds, jts, orgs, and invs
2016-04-11 13:56:13 -04:00
Akita Noek
09f1473ef9
Added direct access via teams to the access_list endpoint
2016-04-11 13:46:27 -04:00
Akita Noek
4531f276c2
Updated access_list to include team information for indirect access coming from teams
...
Finally addresses #1212
2016-04-11 13:46:27 -04:00
Wayne Witzel III
03845eb2fe
remove age_deleted mgmt cmd, no longer needed
2016-04-11 11:26:06 -04:00
Wayne Witzel III
4638195065
Merge pull request #1474 from wwitzel3/rbac-bug-1390
...
Updates for #1390
2016-04-11 10:22:27 -04:00
Wayne Witzel III
8e3b48b965
update required/optional and explicitly show any value disassociate
2016-04-11 10:20:55 -04:00
Wayne Witzel III
a317aa6a31
added Network Credential unit tests
2016-04-11 10:14:51 -04:00
Wayne Witzel III
2a3e5dd0c0
make fifo a helper for easier testing, fixed proot check
2016-04-11 10:14:50 -04:00
Wayne Witzel III
e8b35533e4
added initial API support for Network credential
2016-04-11 10:14:02 -04:00
jlmitch5
25b8faa81a
updated merge conflict that was introduced in tag search ui pr
2016-04-11 09:38:44 -04:00
John Mitchell
382c7d9bbb
Merge branch 'tagSearchUI' into devel
2016-04-08 13:33:13 -04:00
