765dcd3318
Added queries that calculate counts for organization resources
2016-03-12 22:02:03 -05:00
a1c843e9f6
Merge pull request #1226 from leigh-johnson/CopyJobTemplate2
...
v2, Directly edit a copied Job Template, refactor delete-job-template-service-test
2016-03-11 18:51:52 -05:00
34fd07de7a
Merge pull request #1225 from wwitzel3/rbac
...
Fixed up m2m_changed for rbac, added User.admin_role
2016-03-11 16:04:40 -05:00
16673b1468
Fix the m2m_changed when accessed reversed
2016-03-11 15:59:01 -05:00
ff1c41e8dc
revert unintended change to awx-munin.conf
2016-03-11 15:33:16 -05:00
45483fb057
Refactor m2m_changed so reverse works
2016-03-11 15:18:24 -05:00
eab223d229
Make sure we are covering system jobs and template on notifications
2016-03-11 15:11:08 -05:00
31a461956a
Fixed up m2m_changed for rbac, added User.admin_role
2016-03-11 14:59:47 -05:00
e34aebcd93
refactor delete-job-template.service-test, integrate jobTemplate.copy, resolves #1105 & #1047 , tracking #1176
2016-03-11 14:41:05 -05:00
cdc342a6ee
Fix fact database migration
...
For new installs the database may not be online and thus the migration
can't happen. This will allow it to continue but we may want more
messaging to the user running potential upgrades
2016-03-11 12:59:21 -05:00
4024bbfe2b
Merge pull request #1222 from wwitzel3/rbac
...
Remove UserResource and ensure RolePermission during migration
2016-03-11 11:00:29 -05:00
80013e67bc
Remove UserResource and ensure RolePermission during migration
2016-03-11 10:58:24 -05:00
55dc21e97d
Merge pull request #1219 from wwitzel3/rbac
...
Allow org.admin_role.members to administer org.member_role.members
2016-03-11 10:53:02 -05:00
94e8058127
Allow org.admin_role.members to administer org.member_role.members
2016-03-11 10:41:42 -05:00
a45e5b9eab
Merge pull request #1217 from wwitzel3/rbac
...
Added user role creation, accessible methods, and fixed up m2m_update
2016-03-11 09:40:31 -05:00
55e071535b
Added user role creation, accessible methods, and fixed up m2m_update
2016-03-11 07:07:17 -05:00
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
2e232159e0
Merge pull request #1116 from jlmitch5/rbac_add_perms
...
Rbac UI: add permissions modal
2016-03-10 15:39:03 -05:00
8f1cdbdbf9
fixed modal being open on route change and modal scrolling
2016-03-10 14:50:42 -05:00
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
0006a6847c
Merge pull request #1208 from chrismeyersfsu/mongoectomy_packaging
...
remove mongo as packaging req
2016-03-10 11:39:15 -05:00
447646ae41
Merge pull request #1207 from mabashian/survey-buttons-checkbox
...
Survey buttons and checkbox
2016-03-10 11:20:09 -05:00
ca6e6e06e9
Merge pull request #1193 from chrismeyersfsu/mongoectomy_migration
...
migrate data from mongo to postgres
2016-03-10 11:06:39 -05:00
3fde9050a4
Merge pull request #1204 from chrismeyersfsu/fix-remove_mongo
...
remove the starting of mongo
2016-03-10 07:34:37 -05:00
63d91268ea
add no description provided in case one is not for a role in the key
2016-03-09 16:52:06 -05:00
cf1a78866c
flake8
2016-03-09 16:51:52 -05:00
6097406e36
add key pane
2016-03-09 16:51:02 -05:00
259d4ec47b
flake8
2016-03-09 16:48:42 -05:00
0b531adaf3
Added survey buttons to the job templates form(s) and removed the checkbox
2016-03-09 16:46:04 -05:00
4ff16548b6
drop mongo database when complete
2016-03-09 15:53:07 -05:00
87c9798c09
added process errors and fixed css bug on add perm modal
2016-03-09 15:40:41 -05:00
3829f276e7
remove debug from add perm partial
2016-03-09 15:40:40 -05:00
09c54b1e88
better formed css for add permissions
2016-03-09 15:40:40 -05:00
0026ed88eb
fixed table header radius at end of list row
2016-03-09 15:40:40 -05:00
56364617fd
clean up of ui rbac code
2016-03-09 15:40:40 -05:00
433ba95add
working commit of rbac add permissions flow
2016-03-09 15:40:40 -05:00
6b37054621
working commit rbac add permissions
2016-03-09 15:40:40 -05:00
2f1ee901e4
fixes to pr
2016-03-09 15:40:40 -05:00
9ea0803b45
added role list and deletion to projects object
2016-03-09 15:40:40 -05:00
3d963d540f
remove the starting of mongo
2016-03-09 15:40:09 -05:00
8ff766f5df
Merge pull request #1203 from wwitzel3/rbac
...
test fixups and re-add can_access
2016-03-09 15:35:26 -05:00
09d46f9336
test fixups and re-add can_access
2016-03-09 15:33:12 -05:00
2e86c58a65
remove mongo fact tests
2016-03-09 15:25:58 -05:00
bc6eaeb0a9
migrate data from mongo to postgres
2016-03-09 15:25:57 -05:00
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
220d4c635e
fix fact cache receiver
2016-03-09 14:41:54 -05:00
84d7f6c13f
Moved job template routes, controllers, and views out into its own module.
2016-03-09 14:24:24 -05:00
0d0d87073e
Merge pull request #1197 from anoek/rbac
...
Fixed up migrations after last merge
2016-03-09 13:11:10 -05:00
97a6f23380
Fixed up migrations after last merge
2016-03-09 13:08:02 -05:00
f59e603c18
Merge pull request #1195 from anoek/rbac
...
Merging in devel
2016-03-09 12:05:06 -05:00
AlanCoding
Leigh
Akita Noek
Wayne Witzel III
Leigh Johnson
Matthew Jones
jlmitch5
Chris Meyers
Michael Abashian
Michael Abashian
Akita Noek