12954 Commits

Author SHA1 Message Date
Chris Meyers
a2320c5b5e Merge pull request #5614 from chrismeyersfsu/fix-5613
give a default other than None
2017-03-02 14:25:12 -05:00
Chris Meyers
54bcdccdab give a default other than None
1. If the setting isn't in the database, then the specified default is
returned.
2. If the setting IS in the database, then the 'value' field, from the
database, is returned; Unless, the value is null in the database, then
the defined default is returned.
* Take case 1. If the default=None then an AttributeError is raised
* Thus, by setting default='', in case 1. We don't get an AttributeError
because '' will be returned.
* Also note that we don't allow_null=True because then the database
entry could be None. Accessing the setting would raise an AttributeError
in this case. Further, since we set default='' it doesn't matter if null
is in the database.

TL;DR set default=<something_other_than_None>
2017-03-02 13:36:48 -05:00
Michael Abashian
956beba290 Import shared modules in shared/main.js rather than app.js 2017-03-02 10:51:15 -05:00
Michael Abashian
0d2f16d34d Merge branch 'mabashian-modularize-helpers-utilities' into devel 2017-03-02 10:23:32 -05:00
Michael Abashian
778c4ab557 Merge branch 'modularize-helpers-utilities' of https://github.com/mabashian/ansible-tower into mabashian-modularize-helpers-utilities
# Conflicts:
#	awx/ui/client/src/activity-stream/main.js
#	awx/ui/client/src/app.js
#	awx/ui/client/src/helpers.js
#	awx/ui/client/src/helpers/Credentials.js
#	awx/ui/client/src/helpers/Groups.js
#	awx/ui/client/src/helpers/Hosts.js
#	awx/ui/client/src/helpers/teams.js
2017-03-02 10:20:32 -05:00
Michael Abashian
f174afb6df Import variables, parse, loadconfig in the correct place 2017-03-01 16:43:28 -05:00
Michael Abashian
999c3dca08 Merge pull request #5602 from mabashian/5600-project-scm-cred
Typing in scm credential when add/edit project fix
2017-03-01 16:30:11 -05:00
Jared Tabor
c839bb67d0 Merge pull request #5594 from jaredevantabor/decouple-jobDetails-jobResults
RIP Old Job Details Page
2017-03-01 13:14:21 -08:00
jaredevantabor
7f16036171 fixing merge conflicts 2017-03-01 12:56:30 -08:00
jaredevantabor
66352ce5c9 removing last reference to job detail of any kind 2017-03-01 12:54:30 -08:00
jaredevantabor
dc5716f0ea changing jobDetail to jobResults throughout the app 2017-03-01 12:54:30 -08:00
jaredevantabor
daa3746ef7 removing helpers/JobDetail.js 2017-03-01 12:54:30 -08:00
jaredevantabor
14d9eb9277 removing some old stale code from host event stdout after decoupling job-results from job-details 2017-03-01 12:53:20 -08:00
jaredevantabor
edaf3e1f25 removing old job-details folder 2017-03-01 12:53:20 -08:00
jaredevantabor
5c22cb1f69 moving some functions from JobDetailService to jobResultsService
in order to decouple the old job details from the new job results so we can
remove the job detail files at some point
2017-03-01 12:52:25 -08:00
James Laska
59b08cfbaf Merge pull request #5604 from jlaska/ami_playbook_changes
Playbook changes to improve AMI publishing
2017-03-01 14:59:43 -05:00
James Laska
6d3c37b1ef Merge pull request #5598 from jlaska/preflight_old_ha_inventory
Add unsupported primary pre-flight check
2017-03-01 14:51:02 -05:00
Michael Abashian
6604a36bc9 Merge pull request #5599 from mabashian/cleanup-widgets
Cleanup widgets
2017-03-01 14:25:32 -05:00
Michael Abashian
43c5c13311 Merge pull request #5595 from mabashian/5581-encode-default-search
Encode default search param
2017-03-01 14:24:16 -05:00
Michael Abashian
2697fcdbc3 Removed console 2017-03-01 14:14:08 -05:00
Michael Abashian
2610009b56 Fixed bug where typing in scm credential when adding/editing project wouldn't work 2017-03-01 14:12:03 -05:00
jlmitch5
2b838a3978 Merge pull request #5592 from jlmitch5/removeOldSearchComments
remove old search comments
2017-03-01 14:03:16 -05:00
John Mitchell
45620f35a3 fix jshint error 2017-03-01 13:50:02 -05:00
John Mitchell
55b74ddd23 fix refresh and refreshJobs functions 2017-03-01 12:46:39 -05:00
Michael Abashian
ab0e20c976 Remove StreamWidget 2017-03-01 11:54:18 -05:00
Michael Abashian
239d3001d1 Widgets dir cleanup 2017-03-01 11:48:38 -05:00
Michael Abashian
09771927c9 Encode default search param 2017-03-01 10:27:28 -05:00
Alan Rominger
9e109019fe Merge pull request #5574 from AlanCoding/req_test_dev
In requirements test, skip -e entries from pip freeze
2017-03-01 09:21:43 -05:00
AlanCoding
f90ba8e6a6 small refactor of python requirement test to work in dev env 2017-03-01 09:04:31 -05:00
Michael Abashian
0487b664ca Fixed unit tests 2017-02-28 16:30:57 -05:00
Wayne Witzel III
87da7d6a93 Merge pull request #5591 from wwitzel3/release_3.1.1
update asgi_amqp version
2017-02-28 16:04:30 -05:00
Michael Abashian
d6ba134234 Helpers directory cleanup 2017-02-28 15:54:04 -05:00
John Mitchell
cb30b47098 remove old search comments 2017-02-28 15:46:32 -05:00
Jared Tabor
5592d44ec1 Merge pull request #5578 from jaredevantabor/host-event-stdout
host event stdout changes
2017-02-28 12:36:00 -08:00
Graham Mainwaring
4b68a2f208 Merge pull request #5582 from ghjm/devel
Fix MD5 for CentOS 7.3 ISO
2017-02-28 14:21:17 -05:00
Ryan Petrello
7b34b36e5e Merge pull request #5576 from ryanpetrello/fix-4756
prohibit API payloads that represent something other than a JSON object
2017-02-28 14:04:32 -05:00
Wayne Witzel III
9eed328107 update asgi_amqp version 2017-02-28 14:03:52 -05:00
Chris Meyers
9db49d9819 Merge pull request #5586 from chrismeyersfsu/fix-job_start_websocket_race
emit job status over socket after database commit
2017-02-28 13:25:44 -05:00
Ryan Petrello
d97ff57cda prohibit API payloads that represent something other than a JSON object
The JSON serializer for our API uses ``json.loads``, which permits *any*
valid JSON (including bare integers, boolean values, etc).  Lots of our
code, however, assumes that inbound JSON content will be a dict.

see: #4756
2017-02-28 13:23:03 -05:00
Chris Meyers
c4fb88c0d9 remove uneeded post commit wrapper
* Since we changed the lower level method to always use post commit
message emit
2017-02-28 13:10:00 -05:00
Chris Meyers
e09497108e all job status change websockets events should happen after the job hits
the database
2017-02-28 12:56:55 -05:00
Chris Meyers
b85361732b Revert "emit job status over socket after database commit"
This reverts commit edefeeacdaf11cf484a4b4893ee9acde5ef85390.
2017-02-28 12:53:59 -05:00
Chris Meyers
7da52c8bef emit job status over socket after database commit
* Wait until the newly created job record hits the database before
telling the websocket clients that the job's status is "pending"
2017-02-28 12:39:55 -05:00
Michael Abashian
e5cfa51410 Merge pull request #5584 from mabashian/controllers-audit
Leftover cleanup from 3.1 back to devel
2017-02-28 12:39:37 -05:00
Michael Abashian
bfcbd8a823 Leftover cleanup from 3.1 back to devel 2017-02-28 12:03:41 -05:00
Matthew Jones
1fefa4cfdd Merge branch 'stable' into devel
* stable: (275 commits)
  Install correct rpm-sign package in RPM builder
  Updating changelog for 3.1 release
  Switch job_type to check from sync when detecting delete_on_update
  use Unicode apostrophes - not single quotes - for French i18n strings
  pin appdirs==1.4.2
  only cancel deps if we can cancel the inv update
  fixing module_name check and adding support for the debug module
  cancel jobs dependent on inv update
  update tests
  CSS tweaks to workflow results panels
  like inventory updates, check if project update deps already processed
  Revert "Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked"
  Add awx/ui/client/languages to .gitignore
  Delete awx/ui/client/languages/*.json
  refactor based on review
  Add missing permission check.
  Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement
  avoid duplicated related search fields
  Fix workflow audit items
  fixing module name, json blob, and stdout-for-yum-module on host event
  ...
2017-02-28 11:37:05 -05:00
Ryan Petrello
d95b49d3e1 Merge pull request #5579 from ryanpetrello/release_3.1.1
requeue websocket messages that don't (yet) have an established user
2017-02-28 11:20:12 -05:00
Ryan Petrello
45819f6b9a requeue websocket messages that don't (yet) have an established user
There's a race between our `ws_connect` and `ws_receive` methods;
it's possible to fall into a scenario where we're handling a legitimate
message *before* django-channels is able to persist the `user_id` into
the channel session.  This results in a scenario where a user can open
a browser tab and never receive new websocket messages.  In this
scenario, we should just toss the message back into the queue and try
again later (up to a reasonable limit of retries).
2017-02-28 11:12:59 -05:00
Chris Meyers
4271dc23d4 Merge pull request #5580 from chrismeyersfsu/fix-rabbit_mq_password_required
rabbit_mq_password required
2017-02-28 10:39:40 -05:00
jaredevantabor
9cbf9a5c47 host event stdout changes 2017-02-27 18:52:45 -08:00