11759 Commits

Author SHA1 Message Date
Ryan Petrello
d24fb32358 blacklist certain sensitive fields and relations as search arguments
see: #5465
see: #5478
2017-02-21 16:18:02 -05:00
Matthew Jones
0a5b43acae Make unit test valid
Failed after recent changed that exposed the invalidity
2017-02-21 12:50:41 -05:00
Matthew Jones
46605eb591 Fix an issue filtering with non ints against foreign keys
I feel like this probably worked at one time but no longer does. It
makes me wonder if ForeignObjectRel was meant to be the catchall but
no longer is.
2017-02-21 12:33:15 -05:00
Michael Abashian
0c75efdd99 Tighten up workflow maker form tabs 2017-02-21 12:25:28 -05:00
Alan Rominger
711bee9633 Merge pull request #5414 from AlanCoding/manage_context
Disable activity stream in cleanup_jobs, test things
2017-02-21 12:20:34 -05:00
AlanCoding
0bd606e26f remove unnecessary imports after context manager change 2017-02-21 12:08:03 -05:00
Michael Abashian
7385d66f3f Merge pull request #5457 from mabashian/5195-on-off-toggle
Changed remaining toggles from <div> to <button>
2017-02-21 11:46:29 -05:00
Michael Abashian
ece9f5592a Merge pull request #5490 from mabashian/5482-search-key-v2
Fixed search key on inv manage
2017-02-21 11:45:43 -05:00
jlmitch5
a55f3d9ee8 Merge pull request #5473 from jlmitch5/fixDetailTabInvManageGroup
fix detail tab for inventory manage edit group
2017-02-21 11:30:26 -05:00
Alan Rominger
c9e3fc3601 Merge pull request #5445 from AlanCoding/sub_ct_from_cache
Allow UJT content type list to come from manager cache
2017-02-21 10:33:21 -05:00
Michael Abashian
eb642c1028 Changed cancel workflow text from CANCEL to PROCEED 2017-02-21 10:22:44 -05:00
Michael Abashian
edb1f6a130 Fixed search key on inv manage 2017-02-21 10:13:53 -05:00
Michael Abashian
f377136095 Merge pull request #5471 from mabashian/4987-adhoc
Leave user on jobs list when relaunching adhoc command
2017-02-21 10:06:08 -05:00
Alan Rominger
95e1caed56 Merge pull request #5443 from AlanCoding/vars_disp
Prevent server error in /variables/ endpoint
2017-02-20 22:29:08 -05:00
Alan Rominger
7d49d048e7 Merge pull request #5429 from AlanCoding/m2m_types
Integer (or generic ForeignKey) coercion for m2m filters
2017-02-20 22:25:57 -05:00
Alan Rominger
2b0f327523 Merge pull request #5458 from AlanCoding/migration_version
add method to obtain the migration state of Tower
2017-02-20 17:14:08 -05:00
AlanCoding
a57d8fe9fd treat GFJ and FJ and M2M all the same for type in querystring 2017-02-20 17:11:08 -05:00
Ryan Petrello
8d27c0873b Merge pull request #5480 from ryanpetrello/fix-5477
fix a minor bug in survey_spec password field handling
2017-02-20 16:57:23 -05:00
Ryan Petrello
e36cd17c16 fix a minor bug in survey_spec password field handling
see: #5477
2017-02-20 16:50:07 -05:00
Ryan Petrello
9a1ce022fe Merge pull request #5476 from ryanpetrello/fix-5453
mark a variety of host-related strings for i18n
2017-02-20 16:21:17 -05:00
Ryan Petrello
46fdc123f4 more i18n string marking for host forms
see: #5476
2017-02-20 16:12:58 -05:00
Ryan Petrello
e13e817984 mark i18n strings for the inventory host form
see: #5453
2017-02-20 16:03:01 -05:00
Ryan Petrello
e4e599c891 mark i18n strings for the dashboard host list
see: #5453
2017-02-20 16:03:01 -05:00
Ryan Petrello
176a0aa84b mark i18n strings for the dashboard host form
see: #5453
2017-02-20 16:02:55 -05:00
Michael Abashian
89ed9efe8d Fixed bug rendering workflow details 2017-02-20 15:49:00 -05:00
John Mitchell
fb72a0ba13 fix detail tab for inventory manage edit group 2017-02-20 15:10:23 -05:00
Michael Abashian
66f37533ec Leave user on jobs list when relaunching adhoc command 2017-02-20 14:45:12 -05:00
AlanCoding
87af8f7a38 add method to obtain the migration state of Tower 2017-02-20 13:17:21 -05:00
Michael Abashian
d9a20b0489 Changed remaining toggles from <div> to <button> 2017-02-20 13:14:08 -05:00
Ryan Petrello
ce0096f308 Merge pull request #5444 from ryanpetrello/fix-5431
fix a visual bug for limited screen widths on the job view UI
2017-02-20 12:03:56 -05:00
John Mitchell
11ac1db1c7 fix safari desktop responsive view 2017-02-20 11:55:29 -05:00
Alan Rominger
928d160f3d Merge pull request #5439 from AlanCoding/sys_aud_NT
block system auditors from attaching notification templates
2017-02-20 11:32:50 -05:00
AlanCoding
757982088c allow UJT content type list to come from cache 2017-02-17 22:08:18 -05:00
Ryan Petrello
d08fd82260 fix a visual bug for limited screen widths on the job view UI
see: #5431
2017-02-17 17:13:08 -05:00
jlmitch5
7b8f8b88ea Merge pull request #5440 from jlmitch5/errorMessageForLegacyJobs
show error message for <= 3.0.x jobs
2017-02-17 17:04:29 -05:00
AlanCoding
1386fdeb1a prevent server error in /variables/ endpoint 2017-02-17 16:57:13 -05:00
Ryan Petrello
080b7fd5c2 Merge pull request #5389 from ryanpetrello/fix-5387
don't trim newlines from custom inventory scripts; they may be relevant
2017-02-17 16:55:21 -05:00
John Mitchell
329156a9eb add toDestroy to watch statement 2017-02-17 16:48:44 -05:00
Wayne Witzel III
fd82f4280c Merge pull request #5442 from wwitzel3/issue-5441
make OrderingFilter part of our default filters
2017-02-17 16:24:20 -05:00
AlanCoding
6d961d92c9 block system auditors from attaching notification templates 2017-02-17 16:17:07 -05:00
Wayne Witzel III
a55e79e94d make OrderingFilter part of our default filters 2017-02-17 16:16:28 -05:00
jaredevantabor
9a12973abd fixing z-index of smart-search button 2017-02-17 15:58:18 -05:00
John Mitchell
c52796da61 show error message for <= 3.0.x jobs 2017-02-17 15:55:21 -05:00
jaredevantabor
ea1a6d17b3 null pointer exception in ProcessErrors 2017-02-17 15:48:16 -05:00
Ryan Petrello
734ec91e3b Merge pull request #5430 from ryanpetrello/fix-5407
properly count hosts based on job event task state
2017-02-17 14:11:59 -05:00
Michael Abashian
3930c0ca37 Merge pull request #5433 from jlmitch5/fixWorkflowJobTemplatePermHiding
fix permissions workflow job weirdness
2017-02-17 13:59:24 -05:00
Michael Abashian
8c183813e0 More workflow permissions work 2017-02-17 13:45:26 -05:00
John Mitchell
c51fa69da6 don't stop event buffer 2017-02-17 13:34:34 -05:00
John Mitchell
321e2a7673 fix permissions workflow job weirdness 2017-02-17 12:19:29 -05:00
Ryan Petrello
bda089e3f5 properly count hosts based on job event task state
the intention of the host summary view is that each host belongs in at
most *one* state - determined by the state of the tasks that ran on it.
this change examines each host for a job and determines its state based
on whether tasks passed, resulted in changes, were skipped, failed,
etc...

see: #5407
2017-02-17 11:36:52 -05:00