1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

9092 Commits

Author SHA1 Message Date
Matthew Jones
965827ca4e Merge pull request #3318 from ansible/revert-3244-3199_ignored_task_result_inconsistent
Revert "Prevent ignored task from being displayed as failing."
2016-08-22 13:37:15 -04:00
Matthew Jones
e40a482cc9 Merge pull request #3317 from ansible/revert-3307-3199_2_change_job_event_save_behavior
Revert "Modify job event save behavior"
2016-08-22 13:37:04 -04:00
Matthew Jones
6cf567e4fd Revert "Prevent ignored task from being displayed as failing." 2016-08-22 13:34:52 -04:00
Matthew Jones
16fce59512 Revert "Modify job event save behavior" 2016-08-22 13:34:08 -04:00
Aaron Tan
0991e213cc Merge pull request #3252 from jangsutsr/2955_update_system_job_start_access
Update system job start access
2016-08-22 12:35:48 -04:00
Matthew Jones
81447df1b1 Merge pull request #3309 from jakemcdermott/bug-3308
update setup.sh option parser such that -r doesn't expect an argument
2016-08-22 11:44:19 -04:00
Wayne Witzel III
706e98c392 fixing old tests for new user creation permissions 2016-08-19 18:54:56 -04:00
Graham Mainwaring
f5b4c63173 Clean venv on 'make clean' 2016-08-19 16:28:09 -04:00
Aaron Tan
871ae0f5c7 Merge pull request #3307 from jangsutsr/3199_2_change_job_event_save_behavior
Modify job event save behavior
2016-08-19 16:20:13 -04:00
James Laska
08c4c9647b Resolve KeyError by coercing instance_id to a str
Related #3300
2016-08-19 15:37:28 -04:00
James Laska
188f81ef3d Update cloudforms dynamic inventory
Pulling the latest from
https://github.com/ansible/ansible/blob/devel/contrib/inventory/cloudforms.py

Related #3168
2016-08-19 15:37:28 -04:00
James Laska
a847495bea Update foreman inventory script
Per request from Red Hat Satellite team, update to the latest foreman.py

https://github.com/theforeman/foreman_ansible_inventory/blob/master/foreman_ansible_inventory.py
2016-08-19 15:37:28 -04:00
Leigh Johnson
25fa05da81 enable less sourcemaps, add cleanup for npm cmds run with --prefix 2016-08-19 13:16:24 -04:00
Matthew Jones
8893f8278a Merge branch 'release_3.0.2' into devel
* release_3.0.2: (126 commits)
  Disable permissions tab in Credential > Edit form if Credential is private (#3288)
  Tweaked the popover text for job and skip tags on JT add/edit
  Workaround a cascade setnull polymorphic issue
  flake8
  Fixed old test expectations
  Made it so the credential organization field can't be changed
  Skip some unit tests
  Fixed org auditor visibility of team credentials
  Fix sosreport
  fix credential kind options for list
  interpret any code below 300 as success
  bail when status code is over 300
  Make CloudForms inventory_script work
  Use no_log when handling passwords
  Prevent ignored task from being displayed as failing.
  making ec2 cred optional on group->edit
  making ec2 credential optional for ec2 inventory
  Revert "Fix to ensure org auditors can see team credentials"
  Fixed team credential list to work with corrected permissions
  Making the username and password fields optional
  ...
2016-08-18 22:52:55 -04:00
jangsutsr
5b00bb14ca Modify job event save behavior 2016-08-18 18:59:33 -04:00
Leigh Johnson
fc1ca378d1 Disable permissions tab in Credential > Edit form if Credential is private (#3288)
* disable permissions tab in credential > edit view if credential is private, resolves #3265

* add tooltip indicating why permissions tab is disabled if cred is private
2016-08-18 13:49:05 -04:00
Michael Abashian
b25cf0b5cb Merge pull request #3299 from mabashian/3196-skip-tags-help-text
Tweaked the popover text for job and skip tags on JT add/edit
2016-08-18 11:39:38 -04:00
Wayne Witzel III
cef7f5a165 prevent non-superusers from adding orphan users 2016-08-18 09:55:20 -04:00
Michael Abashian
52803d2f04 Tweaked the popover text for job and skip tags on JT add/edit 2016-08-17 16:38:29 -04:00
Leigh Johnson
ce61fe4a42 Refactor UI Build System (#3203)
* initial build trial, clean up awx/ui

* fix hardcoded refs to ng-toast, add jshint preloader

* remove browserify test

* update grunt-jshint -> jshint module loader, browser-sync, update dev targets to build-docker-machine & build-docker-cid, fix blocking tasks

* less autoprefixer

* sample build commands

* fix release build

* update README

* karma config stub

* webpack config for karma tests

* karma preview for shane

* fix build-docker-machine target

* karma+webpack test pipeline configuration, stub tests

* fix smart/job status icons classes

* fix jquery + jsyaml shims, fix LESS cascade

* fix angular-codemirror dependency, explicitly import style/mode dependencies

* shim jsonlint

* fix angular-scheduler AMD imports, remove jquuery-ui shim, fix release config

* use closed $.fn.datepicker for system-tracking

* remove packaging/node/

* remove old tests

* shrinkwrap fragile dependency sandcastle, update README, lint

* first pass at fixing rrule shim

* update makefile targets

* update gitignore w/ new flag file

* add saucelabs karma config

* add license controller test

* add examples of service and directive tests

* Makefile flubs

* consolidate clean-ui target, compulsively update flag file location

* dep on CJS/AMD/UMD compatible version of rrule lib, fix example tests/config for demo

* boilerplate karma config for saucelabs (should be abstracted to common config after proven to work)

* update docs

* docs feedback

* update Dockerfile with Node 6.x dep
2016-08-17 16:09:54 -04:00
Akita Noek
19fbe4b7fd Merge pull request #3274 from anoek/3081
Prevent private credentials from being to assigned to teams
2016-08-17 15:57:59 -04:00
Matthew Jones
3beef1d988 Workaround a cascade setnull polymorphic issue
See: https://github.com/django-polymorphic/django-polymorphic/issues/229
2016-08-17 12:55:12 -04:00
Akita Noek
6464f6e3d6 flake8 2016-08-16 15:54:12 -04:00
Akita Noek
91cd32d304 Fixed old test expectations 2016-08-16 15:36:07 -04:00
Akita Noek
9c5c09169e Made it so the credential organization field can't be changed
This makes it so the credential organizaiton field can't be changed
through the API (unless the user is a super user). This brings us into
alignment with the original intent.
2016-08-16 15:32:29 -04:00
Akita Noek
fc7d2b6c4e Skip some unit tests
These tests broke because we added some additional checks that utilize
the database within the role assignment code, and because of issue
parsing or forming requets between the unit framework and the django
request code I'd guess (for some reason it looks like the `pk` field
isn't getting parsed out and handed in to the kwargs of a post method..
didn't dig into it though.)
2016-08-16 14:53:53 -04:00
Akita Noek
30451f230b Fixed org auditor visibility of team credentials
And by fix, I mean prevent us from getting into the situation that was
causing the asymetric visiblity by brining us into alignment with the
original intention and spec for how credentials were supposed behave.

 #3081
2016-08-16 14:02:09 -04:00
Akita Noek
db87e3cb30 Merge branch 'release_3.0.2' into 3081 2016-08-16 13:52:57 -04:00
Graham Mainwaring
d51edff8a8 Ubuntu 16 support (#3251) 2016-08-16 13:41:23 -04:00
jangsutsr
1365df3d77 Refactor unit test for robustness. 2016-08-16 09:05:17 -04:00
Chris Church
ff9945037f Initialize xmlsec once to prevent SAML auth from hanging. 2016-08-15 14:50:53 -04:00
jangsutsr
0c854dde43 remove redundant permission checks in start views. 2016-08-15 12:02:35 -04:00
jangsutsr
d3968fd080 Enable user for starting system management jobs. 2016-08-15 11:34:17 -04:00
Aaron Tan
fd26cf6176 Merge pull request #3244 from jangsutsr/3199_ignored_task_result_inconsistent
Prevent ignored task from being displayed as failing.
2016-08-14 20:14:06 -04:00
John Mitchell
5467b233eb fix credential kind options for list 2016-08-12 16:29:11 -04:00
Alan Rominger
e5a1ee8b94 Merge pull request #3215 from AlanCoding/2200_job_survey_pass
Save survey passwords in job as new field
2016-08-12 14:04:29 -04:00
Alan Rominger
b3c8333867 Merge pull request #3230 from ansible/AlanCoding-patch-1
Allow for 201 callback status code
2016-08-12 11:30:11 -04:00
AlanCoding
ba101573d6 interpret any code below 300 as success 2016-08-12 11:25:16 -04:00
Jared Tabor
a7a6aaa8ac Merge pull request #3240 from jaredevantabor/email_notification
Making the username and password fields optional
2016-08-12 07:54:27 -07:00
Jared Tabor
5445940e84 Merge pull request #3243 from jaredevantabor/ec2-inventory-credential
EC2 credential should be optional for an EC2 source group (previously required)
2016-08-12 07:18:31 -07:00
Alan Rominger
95011b1aa0 Merge pull request #3235 from AlanCoding/3234_ev_survey_fix
Fix survey extra_vars processing error
2016-08-12 10:17:40 -04:00
AlanCoding
efb66cad20 bail when status code is over 300 2016-08-12 07:31:01 -04:00
James Laska
ee66fd4aa5 Make CloudForms inventory_script work
Fixes a few flake8 issues while at it.
2016-08-11 18:50:42 -04:00
Aaron Tan
f90b244fe6 Prevent ignored task from being displayed as failing. 2016-08-11 17:34:35 -04:00
Jared Tabor
5e4362da69 making ec2 cred optional on group->edit 2016-08-11 13:09:56 -07:00
Jared Tabor
c21e142929 making ec2 credential optional for ec2 inventory
and fixing the autopopulate for that field (it should not autopopulate)
2016-08-11 12:56:17 -07:00
Alan Rominger
ae1af93551 Merge pull request #3242 from ansible/AlanCoding-patch-2
Upgrade django debug toolbar requirement
2016-08-11 13:14:01 -04:00
Akita Noek
3d218d5fca Revert "Fix to ensure org auditors can see team credentials"
This reverts commit 5dcb0e57d80a3bb0553ca8194890a938257a6e93.

New clarification on what the actual desired behavior of this whole
system means this commit is trash, fixing in a much better way.
2016-08-11 11:00:02 -04:00
Akita Noek
f81d6afe83 Fixed team credential list to work with corrected permissions 2016-08-11 10:17:33 -04:00
Alan Rominger
346564491f upgrade django toolbar requirement 2016-08-11 08:38:54 -04:00