11477 Commits

Author SHA1 Message Date
Matthew Jones
986ef9e2eb Merge branch 'release_3.1.0' into devel
* release_3.1.0: (186 commits)
  check related credential for inventory source
  Fixed org jt's smart status
  Show the data that would have been a problem sending payload
  Implement optional message persistence on callback events
  changing the related tab on an edit of an organization to be for users, instead of users & teams
  fixing cancel function for workflow results
  Handle deleting root node while adding a child to that root node
  Skip sending task to process cache changes when migrating to database settings.
  only loop over project OPTIONS response if the response is valid
  Added the ability to pass in a maximum number of pages shown to pagination directive.  This is useful for narrow lists particularly in modals.
  fix a CTinT bug in static config parsing
  Recursively fetch workflow nodes when there is more than 1 page of nodes
  enforce a sane default OPT_NETWORK_TIMEOUT for LDAP connections
  Labels expects the iterator to be `template` not `job_template`
  Disable workflow editor save when currently adding a node
  Fixed up organizations/job templates list
  surface dry_run option for system jobs through the API
  fix bugs with system auditors and orphan JTs
  incorporating organization into the custom inv script option selection for a group
  catch and log LDAP auth plugin misconfigurations
  ...
2017-02-08 14:01:39 -05:00
Alan Rominger
b21513754d Merge pull request #5245 from AlanCoding/inv_src_cred
check related credential for inventory source
2017-02-08 13:47:24 -05:00
Jared Tabor
2c1145570b Merge pull request #5236 from jaredevantabor/remove-teams-from-orgs
Organizations -> Users & Teams, but minus the teams now
2017-02-08 10:39:06 -08:00
Jared Tabor
5ab26a4138 Merge pull request #5235 from jaredevantabor/workflow-cancel
fixing cancel function for workflow results
2017-02-08 10:37:28 -08:00
AlanCoding
f60f1fdcc4 check related credential for inventory source 2017-02-08 13:16:02 -05:00
Michael Abashian
56303c144c Merge pull request #5214 from mabashian/5135-org-job-templates
Fixed up organizations/job templates list
2017-02-08 11:59:20 -05:00
Michael Abashian
aca471ecc9 Merge pull request #5231 from mabashian/4873-pagination-max-pages
Make pagination max pages shown configurable
2017-02-08 11:36:45 -05:00
Michael Abashian
3cef0aed48 Merge pull request #5219 from mabashian/5162-display-large-wf-job
Recursively fetch workflow nodes when there is more than 1 page of nodes
2017-02-08 11:36:21 -05:00
Michael Abashian
9e61c61285 Merge pull request #5218 from mabashian/4939-between-nodes
Disable workflow editor save when currently adding a node
2017-02-08 11:35:29 -05:00
Michael Abashian
7ae5531df1 Fixed org jt's smart status 2017-02-08 11:32:02 -05:00
Matthew Jones
819d8d1fb3 Show the data that would have been a problem sending payload
for websocket
2017-02-08 11:30:15 -05:00
Matthew Jones
4ed054f568 Implement optional message persistence on callback events 2017-02-08 11:11:14 -05:00
jaredevantabor
a7a968e0fa changing the related tab on an edit of an organization to be for users, instead of users & teams 2017-02-07 17:17:03 -08:00
jaredevantabor
db50779731 fixing cancel function for workflow results 2017-02-07 16:04:05 -08:00
Chris Meyers
48e75b3e19 Merge pull request #5196 from chrismeyersfsu/fix-3326
no tooltip for user roles, only team roles
2017-02-07 17:36:06 -05:00
Michael Abashian
a13643ea79 Handle deleting root node while adding a child to that root node 2017-02-07 17:22:50 -05:00
Alan Rominger
5d45e01219 Merge pull request #5211 from AlanCoding/orphan_jt
Fix bug with system auditors and detail view of orphaned JT
2017-02-07 17:01:13 -05:00
Chris Meyers
2917dd799b Merge pull request #5201 from chrismeyersfsu/fix-5096
take into account inv org when getting custom inv src list
2017-02-07 16:40:39 -05:00
Chris Church
15092c2159 Skip sending task to process cache changes when migrating to database settings. 2017-02-07 16:40:03 -05:00
Ryan Petrello
09686e209e Merge pull request #5232 from ryanpetrello/fix-5194
only loop over project OPTIONS response if the response is valid
2017-02-07 16:23:38 -05:00
Ryan Petrello
866fe7e265 only loop over project OPTIONS response if the response is valid
see: #5194
2017-02-07 16:15:03 -05:00
Michael Abashian
6ab48c6896 Added the ability to pass in a maximum number of pages shown to pagination directive. This is useful for narrow lists particularly in modals. 2017-02-07 15:57:07 -05:00
Ryan Petrello
5554b46401 Merge pull request #5230 from ryanpetrello/fix-5223
fix a CTinT bug in static file config handling
2017-02-07 15:39:56 -05:00
Ryan Petrello
52ff35ab3f fix a CTinT bug in static config parsing
see: #5223
2017-02-07 14:42:04 -05:00
Alan Rominger
a7e43034d7 Merge pull request #5213 from AlanCoding/dry_run
Surface dry_run option for system jobs through the API
2017-02-07 13:41:58 -05:00
Ryan Petrello
b07305f3b2 Merge pull request #5217 from ryanpetrello/fix-5208
enforce a sane default OPT_NETWORK_TIMEOUT for LDAP connections
2017-02-07 13:21:05 -05:00
Michael Abashian
643c0e240c Recursively fetch workflow nodes when there is more than 1 page of nodes 2017-02-07 13:21:01 -05:00
Ryan Petrello
f4d55659f0 enforce a sane default OPT_NETWORK_TIMEOUT for LDAP connections
see: #5208
2017-02-07 12:37:05 -05:00
Michael Abashian
388a4345b1 Labels expects the iterator to be template not job_template 2017-02-07 11:20:02 -05:00
Michael Abashian
07dbbd375d Disable workflow editor save when currently adding a node 2017-02-07 11:15:27 -05:00
Michael Abashian
8da10a9183 Fixed up organizations/job templates list 2017-02-07 10:41:18 -05:00
AlanCoding
93034ef1d6 surface dry_run option for system jobs through the API 2017-02-07 10:37:41 -05:00
Ryan Petrello
81805c780f Merge pull request #5207 from ryanpetrello/fix-4356
add the max_page_size value to the OPTIONS response for list views
2017-02-07 10:29:22 -05:00
Chris Meyers
382cb8dd4c Merge pull request #1 from jaredevantabor/custom-inv-script-perm
Groups -> Custom Inv Script selection should incorporate the Org
2017-02-07 09:30:49 -05:00
AlanCoding
e5a8eb95b2 fix bugs with system auditors and orphan JTs 2017-02-07 09:18:23 -05:00
Alan Rominger
5a1b56af42 Merge pull request #5202 from AlanCoding/pretty_sys_jobs
aesthetic editing of system job output
2017-02-07 08:41:50 -05:00
Chris Meyers
e33e03f906 Merge pull request #5193 from chrismeyersfsu/fix-4048
name org permissions tab; users / teams
2017-02-06 20:55:28 -05:00
jaredevantabor
d482ef5575 incorporating organization into the custom inv script option selection for a group 2017-02-06 15:41:56 -08:00
Ryan Petrello
71dd48c97f Merge pull request #5209 from ryanpetrello/fix-5204
catch and log LDAP auth plugin misconfigurations
2017-02-06 16:39:11 -05:00
Ryan Petrello
ea4682e782 catch and log LDAP auth plugin misconfigurations
see: #5204
2017-02-06 16:27:22 -05:00
Matthew Jones
ebc1d95233 Don't perform last job run calculation for sync project updates 2017-02-06 16:22:38 -05:00
Matthew Jones
5eff937f5c Fix location of the uwsgi fifo for dev environment 2017-02-06 16:22:38 -05:00
Ryan Petrello
8615c1e999 add the max_page_size value to the OPTIONS response for list views
see: #4356
2017-02-06 15:18:42 -05:00
AlanCoding
b2f5b82610 aesthetic editing of system job output 2017-02-06 15:15:00 -05:00
Alan Rominger
68d9457de9 Merge pull request #5205 from AlanCoding/fail_inconsistent_system_jobs
Allow system jobs to get sucked up in the fail inconsistent task cleanup
2017-02-06 15:13:52 -05:00
Wayne Witzel III
753cbf18e1 Merge pull request #5206 from wwitzel3/release_3.1.0
fix functional job runtime params tests
2017-02-06 15:02:55 -05:00
Wayne Witzel III
dee359254f fix functional job runtime params tests 2017-02-06 14:50:51 -05:00
AlanCoding
0f0e92ff33 allow system jobs to get sucked up in the fail inconsistent task cleanup 2017-02-06 14:45:44 -05:00
Chris Meyers
d375560f18 take into account inv org when getting custom inv src list 2017-02-06 14:08:18 -05:00
Matthew Jones
8d643dc459 Fix an issue not properly parsing the url port of the tower host
When attempting to determine the proper url for URLField
2017-02-06 14:00:57 -05:00