External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
9,241 Commits 65 Branches 102 Tags
166053e0eb64564656125fe2712ad6b948bb9d25
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AlanCoding 166053e0eb Merge branch 'devel' into wf_rbac_prompt 2016-09-28 09:10:13 -04:00
AlanCoding 6f7e61a5be bump migration number 2016-09-28 09:09:26 -04:00
AlanCoding a452acf214 include scan job_type errors in criteria for rejecting workflow node prompts 2016-09-27 17:24:09 -04:00
AlanCoding fdca3b41ad copy WFJT node prompted fields to WJ nodes, reject or accept on unified job creation 2016-09-27 11:47:07 -04:00
AlanCoding 549273e90f unit test for node prompt values 2016-09-27 09:17:51 -04:00
AlanCoding 1604e2fd02 Workflow RBAC and prompting migration moved back to its own migration file 2016-09-26 16:57:23 -04:00
AlanCoding ca4f2eb005 fix bug where not all char_prompts were coppied to workflow job 2016-09-26 16:53:46 -04:00
AlanCoding dd477d8de8 workflow user_capabilities added 2016-09-26 13:26:43 -04:00
AlanCoding e6273ce46e Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt 2016-09-26 13:19:12 -04:00
Alan Rominger 64944393d3 Merge pull request #3505 from AlanCoding/can_CRUD 
Copy/edit rework
 2016-09-22 11:30:10 -04:00
AlanCoding 57abd438c8 make user_capabilities validation front-loaded, try to run tests 2016-09-22 10:36:30 -04:00
AlanCoding 9acd50b8f3 inject WF node prompts into new jobs, new workflow RBAC tests 2016-09-21 16:04:43 -04:00
AlanCoding 2ffa7a91ec Workflow RBAC and prompting basic changes 2016-09-20 17:16:26 -04:00
AlanCoding 766dac9663 flake8 fix and re-delete test_serializers 2016-09-15 17:23:24 -04:00
AlanCoding 7ff5c40564 Merge branch 'devel' of https://github.com/ansible/ansible-tower into can_CRUD 2016-09-15 17:19:38 -04:00
AlanCoding 113795bd40 remove can_copy and can_edit fields no longer used by UI 2016-09-15 16:32:56 -04:00
AlanCoding 0cb9ab3cf4 fix bugs due to lack of can_start access for some job types 2016-09-13 11:18:34 -04:00
AlanCoding 8075e3876e minor flake8 fixes to rbac_display file 2016-09-13 10:07:02 -04:00
Alan Rominger 43e399df81 Merge pull request #3370 from ansible/AlanCoding-patch-3 
test_credential bug fixes
 2016-09-13 09:56:43 -04:00
Alan Rominger 2e3982e295 Merge pull request #3393 from AlanCoding/role_description_optimization 
Avoid redundant lookups of content_type
 2016-09-13 09:56:03 -04:00
Alan Rominger 475c764162 Merge pull request #3319 from AlanCoding/proj_self_optimization 
Add another special case in summary_fields optimizations
 2016-09-13 09:53:22 -04:00
AlanCoding 0933a91174 Merge branch 'devel' into can_CRUD 2016-09-12 08:56:47 -04:00
AlanCoding d77dc271d8 copy/edit display test refactor, copy prefetch added 2016-09-09 15:13:48 -04:00
AlanCoding 507ba6a778 add new case in prefetch method for foreign-key roles 2016-09-08 15:03:55 -04:00
AlanCoding 6b0df43f3b add unattach field to user and team roles list 2016-09-08 11:09:17 -04:00
AlanCoding 9da00c2d38 RBAC copy/edit displays test refactor 2016-09-07 17:08:07 -04:00
AlanCoding 1ca7ce1bd4 JT OPTIONS based on RBAC, refactoring toward combinational prefetching 2016-09-02 17:07:42 -04:00
AlanCoding 0406431337 refactor step 2, move cacher to utils, generics ListView 2016-09-01 17:20:58 -04:00
Alan Rominger 2fada7a6ad fix flake8 2016-09-01 15:34:06 -04:00
AlanCoding 26ce3a4773 avoid lookup of content_type for description when summarizing object_roles 2016-09-01 15:08:32 -04:00
AlanCoding 398e9466f8 refactor step 1, get access_class within method 2016-09-01 15:05:33 -04:00
AlanCoding fa08c8d4bb wrap up some more implementation, and get caching seriously working 2016-08-31 16:53:47 -04:00
AlanCoding 953b192ff8 polishing of some remaining bugs 2016-08-30 16:56:57 -04:00
AlanCoding 766a7420a1 implement user capabilities in access_list 2016-08-30 15:42:52 -04:00
AlanCoding a32dd5b535 introduce summary_fields for users, showing user_capabilities 2016-08-30 14:02:57 -04:00
AlanCoding 0151967e9c selectively show POST in options for inventory sublists 2016-08-30 11:16:49 -04:00
AlanCoding cf81199bbf Remove extra project-related DB hit, follow same pattern as unified jobs 2016-08-30 10:12:12 -04:00
AlanCoding 381e8aacdd more organization of access method preprocessing 2016-08-29 16:57:30 -04:00
Alan Rominger 5e626cfe2e test_credential bug fixes 
Credential detail view was looked up with the organization's primary key. Works fine when the database arbitrarily gives them both pk=1 in a isolated test, but not a great thing to depend on.
 2016-08-29 15:54:45 -04:00
AlanCoding 23791cb91e Merge branch 'devel' of https://github.com/ansible/ansible-tower into can_CRUD 2016-08-29 14:01:18 -04:00
Alan Rominger f66fa6fb7c Merge pull request #3365 from AlanCoding/makefile_hot_fix 
fix error introduced in Makefile syntax
 2016-08-29 12:00:05 -04:00
AlanCoding 5f15b00a8a fix error Alan introduced in Makefile syntax 2016-08-29 11:46:16 -04:00
Alan Rominger f9cd0fe197 Merge pull request #3352 from AlanCoding/js_makefile 
Updating Jenkins UI targets, and pin pytest in devel
 2016-08-29 11:34:37 -04:00
AlanCoding 52dc28f7c5 jshint given desired commands, although not working 2016-08-29 11:32:42 -04:00
AlanCoding c6c295ef32 pin Dockerfile version as well 2016-08-29 09:50:57 -04:00
AlanCoding 8f1e9bd20d fields generally working as intended now 2016-08-26 17:05:52 -04:00
AlanCoding 1372623080 temporarily pin the pytest version until the ldap error can be fixed 2016-08-26 14:03:41 -04:00
AlanCoding 38879d339b flake8 fix 2016-08-26 13:57:35 -04:00
AlanCoding 3a86a41685 disable all the UI unit tests until things are sorted out 2016-08-26 13:51:49 -04:00
AlanCoding 260e93571e outright remove the old jshint install 2016-08-26 13:35:53 -04:00
AlanCoding 7cfb79110f updating Jenkins UI targets 2016-08-26 13:30:08 -04:00
AlanCoding e4504f789a intermediary state, not yet known to be working 2016-08-26 13:16:06 -04:00
Alan Rominger c87637ea7d Merge pull request #3325 from AlanCoding/temporary_pytest_bump 
Temporary pytest bump for tower unit tests
 2016-08-26 12:58:48 -04:00
AlanCoding 50ec9ca259 temporarily pin the pytest version until the ldap error can be fixed 2016-08-24 15:54:33 -04:00
AlanCoding 23024c8fad Make sure org admins can see credential after migration, comment updates on related tests 
add clause in test to verify automatic setting of org of new team credential
 2016-08-24 11:36:07 -04:00
Alan Rominger 75f513e591 Merge pull request #3324 from AlanCoding/3305_test_update 
Update team admin credential migration test
 2016-08-23 16:40:31 -04:00
AlanCoding bb3e370e56 Update team admin credential migration test to current state-of-knowledge 2016-08-23 14:14:48 -04:00
AlanCoding e461ff0144 Merge branch '2479' of github.com:AlanCoding/ansible-tower into can_CRUD 2016-08-22 15:47:48 -04:00
AlanCoding eddc1a8ed2 implement two methods for can_edit field for testing 2016-08-22 14:43:04 -04:00
Alan Rominger e5a1ee8b94 Merge pull request #3215 from AlanCoding/2200_job_survey_pass 
Save survey passwords in job as new field
 2016-08-12 14:04:29 -04:00
Alan Rominger b3c8333867 Merge pull request #3230 from ansible/AlanCoding-patch-1 
Allow for 201 callback status code
 2016-08-12 11:30:11 -04:00
AlanCoding ba101573d6 interpret any code below 300 as success 2016-08-12 11:25:16 -04:00
Alan Rominger 95011b1aa0 Merge pull request #3235 from AlanCoding/3234_ev_survey_fix 
Fix survey extra_vars processing error
 2016-08-12 10:17:40 -04:00
AlanCoding efb66cad20 bail when status code is over 300 2016-08-12 07:31:01 -04:00
Alan Rominger ae1af93551 Merge pull request #3242 from ansible/AlanCoding-patch-2 
Upgrade django debug toolbar requirement
 2016-08-11 13:14:01 -04:00
Alan Rominger 346564491f upgrade django toolbar requirement 2016-08-11 08:38:54 -04:00
Alan Rominger 9ab3aae59d Merge pull request #3225 from AlanCoding/3188_cheap 
The easy option to show inventory scripts to org auditors
 2016-08-10 16:10:08 -04:00
AlanCoding fab0ff18d8 add unit test for survey vars as strings 2016-08-10 11:02:29 -04:00
AlanCoding a94e97366a fix error processing survey vars 2016-08-10 09:41:04 -04:00
Alan Rominger c1e340fbd6 allow for 201 status_code from callback 2016-08-09 14:56:19 -04:00
AlanCoding 53d6d2734f add conditional to show inventory script to org auditors 2016-08-08 17:13:26 -04:00
Alan Rominger c36dafac3d Merge pull request #3181 from AlanCoding/tests_for_null_tags 
Add API test coverage for empty tags and skip_tags
 2016-08-08 16:48:47 -04:00
AlanCoding 6559118f40 tests for saving survey passwords to job 2016-08-08 13:06:07 -04:00
AlanCoding 9f3d9fa78a carry over survey passwords from old relaunched job 2016-08-05 15:59:11 -04:00
AlanCoding 17ac2cee42 Put survey passwords in job field 2016-08-05 15:11:28 -04:00
Alan Rominger 059c2b0830 Merge pull request #3191 from AlanCoding/job_schema 
Fix error in job schema introduced in ask_skip_tags PR
 2016-08-03 14:20:17 -04:00
AlanCoding 2955af705e fix error in job schema introduced in ask_skip_tags change 2016-08-03 11:37:11 -04:00
AlanCoding d6c4c12c32 add API test coverage for empty tags and skip_tags 2016-08-02 10:43:51 -04:00
Alan Rominger eeda3ce4a1 Merge pull request #3173 from AlanCoding/3115_ask_skip_tags 
Add ask_skip_tags
 2016-08-02 10:21:03 -04:00
AlanCoding c6ecdbbfc1 remove unrelated field from ask_skip_tags_on_launch migration and update 
migration and access.py changes to not conflict with other changes
 2016-08-02 10:04:49 -04:00
AlanCoding bedcdadcfc job launch read_only fields made more clear 2016-08-01 16:49:35 -04:00
AlanCoding 0271aa611c add field to JT for asking to skip tags 2016-08-01 16:49:34 -04:00
Alan Rominger 16959ef17d Merge pull request #3171 from AlanCoding/2567_AS_group_inv 
Show inventory_id in activity stream for groups
 2016-08-01 15:40:47 -04:00
Alan Rominger 1352fe822d Merge pull request #3172 from AlanCoding/3118_role_read 
Drop in visible_roles to RoleAccess can_read
 2016-08-01 15:40:21 -04:00
Alan Rominger d2c040439e Merge pull request #3166 from AlanCoding/3163_host_box 
Allow POST box for host list to show
 2016-08-01 10:12:47 -04:00
AlanCoding 5dbbaf4105 add code to HostAccess can_add so the browsable API will work 2016-07-29 12:02:40 -04:00
Alan Rominger a078254508 Merge pull request #3157 from AlanCoding/3129 
Protect NotFound error in POST to TeamRoles
 2016-07-28 20:20:00 -04:00
AlanCoding 1fb173b2e5 RoleTeam and TeamRole sublist NotFound exception handling and test update 2016-07-28 16:01:42 -04:00
Alan Rominger 2895c9fe9c Merge pull request #3150 from AlanCoding/3146_org_admin_sys_aud 
Limit creation of system auditors to superusers
 2016-07-27 17:16:39 -04:00
AlanCoding 945635eb70 also limit creation of system auditors to superusers 
squash
 2016-07-27 17:02:08 -04:00
Alan Rominger 0c8946702c Merge pull request #3139 from AlanCoding/3096_show_sys_JT 
Show system JTs in the UJT list
 2016-07-27 14:21:24 -04:00
AlanCoding 1d951a7eff use same model method to determine read permission as we do in the views 2016-07-27 12:13:38 -04:00
AlanCoding 32a9c812e3 special case filter to show inventory id for group 2016-07-27 11:48:22 -04:00
AlanCoding e27ce600c5 add system job templates to the unified JT list 2016-07-27 10:28:53 -04:00
AlanCoding 2d2b426374 add read_role to organization select_related 2016-07-25 17:39:19 -04:00
Alan Rominger f5fa53d89a Merge pull request #3098 from AlanCoding/3033_AS_updates 
Reorganize activity stream access around org admin/auditors (3.0.2)
 2016-07-25 11:04:05 -04:00
Alan Rominger 4b3f1d44de Merge pull request #3105 from AlanCoding/new_job_cancel 
Fixes for "new" job things in 3.0.1
 2016-07-22 16:13:39 -04:00
AlanCoding 94c8dfd506 Allow instant cancel for new jobs 2016-07-22 15:49:24 -04:00
AlanCoding 4bea2aa627 Show new jobs in UI Jobs tab 2016-07-22 15:48:37 -04:00
AlanCoding 6fee46fb66 Reorganize activity stream around org admin/auditors 2016-07-22 12:50:14 -04:00