Commit Graph

11979 Commits

Author SHA1 Message Date
Jared Tabor 87a3481fcb Merge pull request #5514 from jaredevantabor/defaults-null-pointer-exception
Extra check to prevent console error
2017-02-22 13:19:30 -08:00
jaredevantabor b724abb684 adding a check to prevent a console error due to null pointer 2017-02-22 13:11:20 -08:00
John Mitchell 4c665171ed fix job results styling 2017-02-22 15:52:24 -05:00
jangsutsr 5af389949e update ACTIONS field of metadata. 2017-02-22 15:45:43 -05:00
AlanCoding d85eda99c6 add back in Inv Src into schedule queryset computation 2017-02-22 15:34:18 -05:00
Matthew Jones b14336bdff Alias unified job template search fields for presentation
The polymorphic accessors have a name that is different than our
normal presentation name for these types. This aliases them for the
presentation layer and then handles processing them when they are
given as filters.
2017-02-22 15:33:47 -05:00
Jared Tabor 0a25b286ca Merge pull request #5509 from jaredevantabor/missing-project-jt
Deleting underlying project from a JT fix
2017-02-22 12:15:06 -08:00
Michael Abashian a484dae41a Fix for deleting search tags on job details 2017-02-22 14:59:54 -05:00
jaredevantabor 30951f4b31 fix for setting scan job template project/playbook
the logic for a scan job was also getting caught for a run job w/ a missing project
2017-02-22 11:58:37 -08:00
jlmitch5 365659051e Merge pull request #5474 from jlmitch5/fixRecentJobRunsList
include workflows on dashboard recent job runs list
2017-02-22 14:37:00 -05:00
Jared Tabor d56317a161 Merge pull request #5500 from jaredevantabor/ctit-reset
[CTiT] Reverting All The Things
2017-02-22 10:59:23 -08:00
jlmitch5 6c799325c8 Merge pull request #5497 from jlmitch5/fixJobResultsRaceCondition
Fix job results race condition
2017-02-22 13:56:46 -05:00
John Mitchell 105a926abe also remove line from karma config coz chris meyers is an idiot 2017-02-22 13:45:43 -05:00
John Mitchell 78dab3741d accidentally messed up karma config, reverting 2017-02-22 13:44:56 -05:00
jaredevantabor b9c2346d57 fixing jshint error 2017-02-22 10:43:42 -08:00
John Mitchell 96121c6189 fix tests 2017-02-22 13:41:12 -05:00
AlanCoding a69a4de51e prohibit additional items from related_search_fields 2017-02-22 13:32:05 -05:00
Ryan Petrello f11e9076cf Merge pull request #5505 from ryanpetrello/fix-5470
set the default in OPTIONS for TOWER_URL_BASE to the request hostname
2017-02-22 12:29:53 -05:00
Ryan Petrello 94ad12ab0d set the default in OPTIONS for TOWER_URL_BASE to the request hostname
see: #5470
2017-02-22 11:16:08 -05:00
Michael Abashian de4aeb064c Fixed recent job runs workflows link 2017-02-22 10:48:53 -05:00
Michael Abashian 293063d315 Pass template type to remaining aw-smart-status directives. The directive will look at the type when generating the href 2017-02-22 10:42:39 -05:00
Ryan Petrello fe053dca83 Merge pull request #5495 from ryanpetrello/blacklist_sensitive_search_keys
blacklist certain sensitive fields and relations as search arguments
2017-02-22 10:28:03 -05:00
Matthew Jones 9e2e119022 Make polymorphic_ctype aliasing work in filters
Previousy this would fall through and get caught by the type checker
2017-02-21 21:32:33 -05:00
Chris Meyers 03d749a630 Merge pull request #5501 from chrismeyersfsu/private-performance_logging
be forgiving in log api log message fields list
2017-02-21 21:08:41 -05:00
jaredevantabor 63f27a120f fixing reset for CodeMirror instances 2017-02-21 17:51:10 -08:00
jaredevantabor 331be6c803 fix for reverting regular textareas 2017-02-21 17:10:01 -08:00
jaredevantabor aa1481b931 fix for jshint 2017-02-21 17:09:45 -08:00
jaredevantabor 198fa2740a reverting custom logo 2017-02-21 16:30:45 -08:00
Chris Meyers 427b484075 be forgiving in log api log message fields list 2017-02-21 19:24:27 -05:00
jaredevantabor 578988f2e4 changing "RESET" to "REVERT" 2017-02-21 14:19:27 -08:00
Alan Rominger 6039ad15af Merge pull request #5498 from AlanCoding/expire_tasks
Expire certain beat tasks if not ran on schedule
2017-02-21 17:10:26 -05:00
Ryan Petrello dc275b757e Merge pull request #5499 from ryanpetrello/fix-5420
mark ON/OFF i18n for certain toggle switches
2017-02-21 16:53:32 -05:00
Ryan Petrello c8d943ccb1 mark ON/OFF i18n for certain toggle switches 2017-02-21 16:32:12 -05:00
Ryan Petrello e9a9a79d94 Merge pull request #5454 from ryanpetrello/fix-5420
disable the on/off toggle button for hosts from dynamic inventory.
2017-02-21 16:30:43 -05:00
jaredevantabor 695a5e9a5d fixing CTiT select2 dropdowns for when the user hits the RESET button 2017-02-21 13:29:44 -08:00
Ryan Petrello 73a5a1e61e mark i18n strings for denied API search parameters 2017-02-21 16:18:06 -05:00
Ryan Petrello d24fb32358 blacklist certain sensitive fields and relations as search arguments
see: #5465
see: #5478
2017-02-21 16:18:02 -05:00
Ryan Petrello 8abf084211 disable the on/off toggle button for hosts from dynamic inventory.
see: #5420
2017-02-21 16:15:47 -05:00
jlmitch5 d2746351e6 Merge pull request #5494 from jlmitch5/fixNoEventCase
fix old job no event case
2017-02-21 16:14:46 -05:00
AlanCoding 7c5856cee6 set expiration time for the disposable system tasks 2017-02-21 15:54:18 -05:00
Michael Abashian 8a6d14771e Merge pull request #5451 from mabashian/5401-lookup-spacing-empty
Remove the extra margin from the empty list when it appears in a modal
2017-02-21 15:24:31 -05:00
John Mitchell a1f5ee501c fix test? 2017-02-21 15:12:35 -05:00
John Mitchell 191cbeee42 make sure entering already running job case doesn't called elapsed to reset 2017-02-21 15:03:36 -05:00
John Mitchell 69220e94de fix race condition with status socket 2017-02-21 14:55:11 -05:00
John Mitchell f59b3ad886 fix job results codemirror non-mono font 2017-02-21 14:53:18 -05:00
Chris Meyers 3e122733c5 Merge pull request #5438 from chrismeyersfsu/private-performance_logging
add a new type of logger, performance.api
2017-02-21 14:35:11 -05:00
Chris Meyers e78377dcfc remove formatters dependency on settings 2017-02-21 14:06:20 -05:00
Michael Abashian f54cd3eef2 Merge pull request #5450 from mabashian/5425-date-formatting
Host event date locale
2017-02-21 13:40:13 -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