Commit Graph
10948 Commits
Author SHA1 Message Date
Matthew Jones c2ea9c3c00 Make survey always visible if license enables
Previously this would only be visible if survey is enabled.  It should
be possible to define and view a survey even if this is disabled.   The
enablement flag controls whether the survey prompt is shown and required.
2016-03-10 16:09:34 -05:00
jlmitch5 2e232159e0 Merge pull request #1116 from jlmitch5/rbac_add_perms
Rbac UI: add permissions modal
2016-03-10 15:39:03 -05:00
John Mitchell 8f1cdbdbf9 fixed modal being open on route change and modal scrolling 2016-03-10 14:50:42 -05:00
Chris Meyers c5eae5de41 Merge pull request #1213 from ansible/revert-1208-mongoectomy_packaging
Revert "remove mongo as packaging req"
2016-03-10 12:02:25 -05:00
Chris Meyers 0006a6847c Merge pull request #1208 from chrismeyersfsu/mongoectomy_packaging
remove mongo as packaging req
2016-03-10 11:39:15 -05:00
Michael Abashian 447646ae41 Merge pull request #1207 from mabashian/survey-buttons-checkbox
Survey buttons and checkbox
2016-03-10 11:20:09 -05:00
Chris Meyers ca6e6e06e9 Merge pull request #1193 from chrismeyersfsu/mongoectomy_migration
migrate data from mongo to postgres
2016-03-10 11:06:39 -05:00
Chris Meyers 3fde9050a4 Merge pull request #1204 from chrismeyersfsu/fix-remove_mongo
remove the starting of mongo
2016-03-10 07:34:37 -05:00
John Mitchell 63d91268ea add no description provided in case one is not for a role in the key 2016-03-09 16:52:06 -05:00
Chris Meyers cf1a78866c flake8 2016-03-09 16:51:52 -05:00
John Mitchell 6097406e36 add key pane 2016-03-09 16:51:02 -05:00
Chris Meyers 259d4ec47b flake8 2016-03-09 16:48:42 -05:00
Michael Abashian 0b531adaf3 Added survey buttons to the job templates form(s) and removed the checkbox 2016-03-09 16:46:04 -05:00
Chris Meyers 4ff16548b6 drop mongo database when complete 2016-03-09 15:53:07 -05:00
John Mitchell 87c9798c09 added process errors and fixed css bug on add perm modal 2016-03-09 15:40:41 -05:00
John Mitchell 3829f276e7 remove debug from add perm partial 2016-03-09 15:40:40 -05:00
John Mitchell 09c54b1e88 better formed css for add permissions 2016-03-09 15:40:40 -05:00
John Mitchell 0026ed88eb fixed table header radius at end of list row 2016-03-09 15:40:40 -05:00
John Mitchell 56364617fd clean up of ui rbac code 2016-03-09 15:40:40 -05:00
John Mitchell 433ba95add working commit of rbac add permissions flow 2016-03-09 15:40:40 -05:00
John Mitchell 6b37054621 working commit rbac add permissions 2016-03-09 15:40:40 -05:00
John Mitchell 2f1ee901e4 fixes to pr 2016-03-09 15:40:40 -05:00
John Mitchell 9ea0803b45 added role list and deletion to projects object 2016-03-09 15:40:40 -05:00
Chris Meyers 3d963d540f remove the starting of mongo 2016-03-09 15:40:09 -05:00
Akita Noek 8ff766f5df Merge pull request #1203 from wwitzel3/rbac
test fixups and re-add can_access
2016-03-09 15:35:26 -05:00
Wayne Witzel III 09d46f9336 test fixups and re-add can_access 2016-03-09 15:33:12 -05:00
Chris Meyers 2e86c58a65 remove mongo fact tests 2016-03-09 15:25:58 -05:00
Chris Meyers bc6eaeb0a9 migrate data from mongo to postgres 2016-03-09 15:25:57 -05:00
Michael Abashian 92f8885946 Merge pull request #1202 from mabashian/modularize-job-templates
Moved job template routes, controllers, and views out into its own module
2016-03-09 15:25:37 -05:00
Matthew Jones 60039b6e40 Merge pull request #1200 from matburt/python27_el6
Changes for Tower virtualenv support
2016-03-09 14:57:51 -05:00
Chris Meyers 220d4c635e fix fact cache receiver 2016-03-09 14:41:54 -05:00
Matthew Jones 4f8763ff90 Changes for Tower virtualenv support
* Break requirements down into ansible and tower reqs
* Generate separate Ansible and Tower virtual environments
* Install appropriate requirements files into each one
* Modify development tools to use these venvs instead of our old
  site-packages
* Modify settings to indicate venv enablement and location of venvs
* Modify tasks to use the proper virtual environment for its purpose
2016-03-09 14:33:42 -05:00
Michael Abashian 84d7f6c13f Moved job template routes, controllers, and views out into its own module. 2016-03-09 14:24:24 -05:00
Akita Noek 0d0d87073e Merge pull request #1197 from anoek/rbac
Fixed up migrations after last merge
2016-03-09 13:11:10 -05:00
Akita Noek 97a6f23380 Fixed up migrations after last merge 2016-03-09 13:08:02 -05:00
Akita Noek f59e603c18 Merge pull request #1195 from anoek/rbac
Merging in devel
2016-03-09 12:05:06 -05:00
Akita Noek 9d4e6dfc16 Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-09 12:04:05 -05:00
Akita Noek 9c78a85a70 Removed old test assertion 2016-03-09 12:03:20 -05:00
Akita Noek 5c8c6fe491 Merge pull request #1187 from anoek/rbac
Replaced Resource table with a GenericForeignKey  on RolePermission
2016-03-09 12:02:46 -05:00
Akita Noek 1989012fd5 Moved access_list url to <whatever>/id/access_list
Eg: organizations/1/access_list will now return a list of all users who
have access to that organization.

This replaces our initial implementation which was resources/id/access_list
2016-03-09 11:41:42 -05:00
Akita Noek efcd4efda2 Moved the rbac field removal migration to happen after the migrate script part of the rbac migration 2016-03-09 11:31:00 -05:00
Akita Noek 87219135af Removed unneeded import 2016-03-09 10:39:31 -05:00
Akita Noek b486c8d658 Merge branch 'rbac-resource-gfk' into rbac 2016-03-09 10:17:58 -05:00
Akita Noek 9aae2979d9 Replaced our 'Resource' table with a GenericForeignKey in RolePermission 2016-03-09 10:12:05 -05:00
Bill Nottingham 943dda231d Merge pull request #1118 from wenottingham/copyright-fix
Welcome to 2016!
2016-03-08 16:36:11 -05:00
Bill Nottingham 3c0254a941 Welcome to 2016! 2016-03-08 16:35:18 -05:00
Matthew Jones 823e54a0b9 Fix an error sending success notifications 2016-03-08 14:14:57 -05:00
Wayne Witzel III 0e641e0ace Merge pull request #1173 from wwitzel3/rbac
RBAC Access Updates
2016-03-08 14:10:27 -05:00
Wayne Witzel III 3df4c4ec93 fixing tests and migration issues 2016-03-08 14:09:16 -05:00
Wayne Witzel III fd2212dd33 More updates to access, use RBAC for permission checks 2016-03-08 13:47:11 -05:00