8902 Commits

Author SHA1 Message Date
Matthew Jones
a06b44ae38 Add sync launch type 2017-01-19 09:47:10 -05:00
Matthew Jones
94ffce07a4 Fix an issue processing job events when uuid isn't present 2017-01-19 09:47:10 -05:00
Chris Meyers
fdeff70244 Merge pull request #4794 from chrismeyersfsu/fix-2827
rectifiy dashboard proj sync count with UI link
2017-01-19 09:46:09 -05:00
Chris Meyers
f5bde47dd8 Merge pull request #4795 from chrismeyersfsu/fix-4611
"reload" page when project deleted
2017-01-19 09:45:50 -05:00
Matthew Jones
7ca496b6ef Merge branch 'release_3.1.0' into multi_worker_callbacks 2017-01-18 20:39:15 -05:00
Ryan Petrello
1b73865477 Merge pull request #4799 from ryanpetrello/release_3.1.0
Properly encode prev/next pagination links when URL contains unicode
2017-01-18 16:45:04 -05:00
Alan Rominger
56e2e28dc8 Merge pull request #4800 from AlanCoding/bad_node_redo
Avoid signal_start override for workflow job spawn
2017-01-18 16:31:39 -05:00
Alan Rominger
f8f08afbb9 Merge pull request #4798 from AlanCoding/workflow_removal
Add workflow jobs to cleanup_jobs management job
2017-01-18 16:24:00 -05:00
Alan Rominger
f5d4cbb482 Merge pull request #4753 from AlanCoding/WJ_delete
Limit workflow job delete access to org admin
2017-01-18 16:09:30 -05:00
Jared Tabor
94b9d6f95a Merge pull request #4776 from jaredevantabor/portal-mode
fixing filter and sockets for portal jobs
2017-01-18 10:23:50 -08:00
Ryan Petrello
d418e41f7e Properly encode prev/next pagination links when URL contains unicode chars.
Resolves #4767
2017-01-18 12:43:27 -05:00
AlanCoding
a8e46021f8 conservative method to validating that a job can be launched from a node 2017-01-18 12:16:45 -05:00
Matthew Jones
73f92bba5d Integrate multiprocessing writer worker in callback receiver 2017-01-18 12:05:29 -05:00
AlanCoding
81eb16523c add workflow jobs to cleanup_jobs management job 2017-01-18 11:50:28 -05:00
Chris Meyers
49a29168e6 "reload" page when project deleted
related to #4611
2017-01-18 11:00:07 -05:00
Chris Meyers
7bc720b435 rectifiy dashboard proj sync count with UI link
* The dashboard project sync failure count only includes project syncs
that have failed, not that have been canceled. Thus, the link from the
dashboard that displays the list of failed project updates should only
include the failed ones, not the canceled ones.

related to #2827
2017-01-18 10:52:07 -05:00
jlmitch5
cf07e08c54 Merge pull request #4771 from jlmitch5/fixPrivEscCredLabels
fix priv escalation field labels from not showing up
2017-01-18 10:40:26 -05:00
Chris Meyers
89b950c3a2 Merge pull request #4775 from chrismeyersfsu/fix-4759
remove token from stdout download
2017-01-18 09:55:09 -05:00
Chris Meyers
942a3eb99d Merge pull request #4781 from chrismeyersfsu/fix-4698
replace all instances of , with \n
2017-01-18 09:54:40 -05:00
Chris Meyers
e0ffb7814d replace all instances of , with \n
related to #4698
2017-01-17 18:25:26 -05:00
Chris Meyers
01c1c513f9 remove token from stdout download
related to #4759
2017-01-17 17:27:13 -05:00
jaredevantabor
e2288f81b6 fixing filter and sockets for portal jobs 2017-01-17 14:17:16 -08:00
Chris Meyers
0d8d9b3643 Merge pull request #4761 from chrismeyersfsu/fix-3326
add org to permission team role
2017-01-17 16:41:52 -05:00
John Mitchell
b4e44d0c56 fix priv escalation field labels from not showing up 2017-01-17 16:03:47 -05:00
Matthew Jones
1cdeb4d2af Refactor event emitter to not use event partials
event emitter now caches to memcache where it is eventually picked up
by the stdout event emitter. This obviates event reassembly in the
callback receiver.
2017-01-17 15:59:43 -05:00
Alan Rominger
8433f647ec Merge pull request #4718 from AlanCoding/more_simple_relaunch
require constituent resource access to relaunch WJ
2017-01-17 15:02:10 -05:00
Chris Meyers
e904deb3e7 subvert potential monkey punch 2017-01-17 15:00:20 -05:00
Chris Meyers
4fdc8f6d35 Merge pull request #4738 from chrismeyersfsu/fix-4185
activity stream, display name of resource as title
2017-01-17 14:47:12 -05:00
AlanCoding
5bfb0f229c graceful handling of null project and inventory in workflow 2017-01-17 14:19:46 -05:00
Jared Tabor
044df78e11 Merge pull request #4735 from jaredevantabor/ssl-tls-radios
Notification Templates -> email "Use TLS/Use SSL" should be radio buttons
2017-01-17 11:16:40 -08:00
jlmitch5
223827e104 Merge pull request #4750 from jlmitch5/readonlyWorkflowsExtraVars
make workflow extra vars look disabled
2017-01-17 13:56:46 -05:00
jaredevantabor
176a3cc399 send empty string for email username/password if no user input 2017-01-17 10:44:00 -08:00
Chris Meyers
768ddaed31 add org to permission team role
related to #3326

* Reduce confusion when 2 teams with the same name, belonging to diff
orgs, are given permission to the same resource. The confusion is
eliminated by showing the org that a team role belongs to in the
tooltip.
2017-01-17 13:31:21 -05:00
Ryan Petrello
e5792157c3 Merge pull request #4755 from ryanpetrello/release_3.1.0
Properly parse subversion revision info.
2017-01-17 13:10:22 -05:00
Ryan Petrello
9e09fd38a7 Properly parse subversion revision info.
The ansible subversion module returns revision info in an unanticipated format:

https://github.com/ansible/ansible/blob/devel/lib/ansible/modules/source_control/subversion.py#L194-L199

Parse out the revision number we actually care about.

Resolves #4654
2017-01-17 10:04:30 -05:00
AlanCoding
d7a41d9db7 limit workflow job delete access to org admin 2017-01-17 09:59:14 -05:00
kensible
c1a6f7b008 Merge branch 'release_3.1.0' into 4673-alert-modal-spacing 2017-01-17 09:32:44 -05:00
kensible
b046f66cd1 Added back alert padding and removed comments 2017-01-17 09:26:52 -05:00
John Mitchell
d8e94f3f15 make workflow extra vars look disabled 2017-01-16 16:36:06 -05:00
Wayne Witzel III
9592c67c31 fixing flake8 errors 2017-01-16 14:16:24 -05:00
Wayne Witzel III
cd5eed9828 remove extra censoring code from tower, not needed since Ansible 2.1+ 2017-01-16 13:54:07 -05:00
Chris Meyers
2088b1fcfe omit search-tags dynamically 2017-01-16 11:07:38 -05:00
Chris Meyers
a58433ed9b activity stream, display name of resource as title
related to #4185

* When activity stream is gone to from a resource edit view, it should:
  * only show activity for the particular object
  * display the name of the resource as a title

This commit patch half-ass does those two things. So what's missing?
That questions is best answered by looking at how the feature behaves in
tower 3.0.3. You'll notice that you are "locked" on the resource you are
viewing the activity stream for. With this commit:
* You aren't locked
* The removal of the resource-id filter (smart-search) is borked.

So what do we need to do?:
* Lock the view to the resource being viewed

How do we need to do it?:
* router params.activity_search.values is a "static" thing. It is used
to tell smart-search to not generate search tags. This is what we want
to do. However, this is a contructor-only parameter. Further, the value
"value" gets passed around to all sorts of other UI contructors that are
hard to get access to when they are needed to try and dynamically set
smart-search ignore search-tags.
2017-01-16 08:57:37 -05:00
Michael Abashian
67b9960d5a Merge pull request #4728 from mabashian/4027-inventory-groups-pagination
Generate the correct base path for groups and hosts so that paginate works properly
2017-01-14 08:33:51 -05:00
Jared Tabor
223c1d5110 Merge pull request #4734 from jaredevantabor/encodeParams
adding extra check for string in encodeParams
2017-01-13 17:04:24 -08:00
jaredevantabor
2217594f27 Changing "Use TLS/Use SSL" radio buttons on the notification template form (for email) 2017-01-13 16:56:57 -08:00
Michael Abashian
66e5cf88ad Fixed basePath at the root level of the inventory manage (thanks @jared) 2017-01-13 18:49:42 -05:00
Michael Abashian
839db07d9a Merge pull request #4729 from mabashian/4690-delete-wfjt-survey
Fixed bug that was preventing wfjt survey deletion
2017-01-13 18:15:28 -05:00
jaredevantabor
2af4a2d558 adding extra check for string in encodeParams 2017-01-13 15:05:33 -08:00
Alan Rominger
46941dab5d Merge pull request #4726 from ansible/AlanCoding-patch-1
put the word granularity in double quotes
2017-01-13 17:16:58 -05:00