1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Commit Graph

8687 Commits

Author SHA1 Message Date
AlanCoding
68d5a702af Team organization field made non-null 2016-07-14 14:38:43 -04:00
AlanCoding
994a72967d Cascade delete teams when their organization is deleted 2016-07-14 11:44:43 -04:00
Jared Tabor
aaab80ad60 Merge pull request #2963 from jaredevantabor/missing-jt
Job Detail page with deleted job templates throws console error
2016-07-12 18:19:23 -07:00
Jared Tabor
c6aa2b4392 removing logic in job detail page related to scm updates
job detail page is only for job runs, scm updates have their own stdout page
2016-07-12 16:03:31 -07:00
Jared Tabor
f88e9cfec1 Check for object keys to avoid console error 2016-07-12 15:44:13 -07:00
Leigh Johnson
d83afabccf Merge branch 'release_3.0.0' of github.com:ansible/ansible-tower into release_3.0.0 2016-07-12 17:39:39 -04:00
Leigh Johnson
abe911108d Merge branch '2947' into release_3.0.0 2016-07-12 17:38:29 -04:00
Leigh Johnson
affd66521d avoid building urls to deleted resources, resolves #2948 (#2956) 2016-07-12 17:33:55 -04:00
Leigh Johnson
b6504da90e fix home > hosts codemirror instance, resolves #2954 (#2960) 2016-07-12 17:32:21 -04:00
Jared Tabor
5d72240d35 Merge pull request #2957 from jaredevantabor/jobs-list-tooltips
Jobs and Scheduled Jobs dynamic tooltip fix
2016-07-12 14:18:12 -07:00
Leigh Johnson
03a04268cf fix prompt-for machine cred query params too 2016-07-12 17:11:10 -04:00
Alan Rominger
7a08f37132 Merge pull request #2945 from AlanCoding/2944_inv_script_orphan_sys_aud
Allow system auditors to see orphan inventory scripts
2016-07-12 16:46:29 -04:00
Michael Abashian
6c62f766e6 Merge pull request #2949 from mabashian/edit-jt-launch
Fixed job template edit launch job attempting to relaunch
2016-07-12 16:31:14 -04:00
Matthew Jones
d6679936da Update license info, add tool for helpsies 2016-07-12 16:30:30 -04:00
Alan Rominger
562b202fca Merge pull request #2951 from AlanCoding/role_user_wording
/roles/N/users/ error message correction
2016-07-12 16:21:44 -04:00
Jared Tabor
9389d9014b Jobs and Scheduled Jobs dynamic tooltip fix
Both tooltips would break if sorting/filtering the jobs list and the scheduled jobs list
2016-07-12 13:17:58 -07:00
Leigh Johnson
745209d362 init search with correct query param, resolves #2947 2016-07-12 15:49:25 -04:00
AlanCoding
646f848cfb fix incorrect error message 2016-07-12 15:46:48 -04:00
Michael Abashian
e6f2b0416a Fixed bug where normal job launch on job template edit was attempting to relaunch. 2016-07-12 15:33:28 -04:00
AlanCoding
15f06ec9d3 allow system auditors to see orphan inventory scripts 2016-07-12 15:03:33 -04:00
Michael Abashian
8a5faf564d Merge pull request #2937 from mabashian/job-launch-active-tab
Updated the tab active background color on the job launch modal
2016-07-12 13:15:23 -04:00
Alan Rominger
cb6035140b Merge pull request #2933 from AlanCoding/notifier_org_auditor
Allow org auditors to see notifications
2016-07-12 13:10:56 -04:00
Michael Abashian
5930ad03fa Updated the tab active background color on the job launch modal to match other tabs 2016-07-12 12:58:28 -04:00
AlanCoding
36286bcda2 notifier rbac test made consistent with others 2016-07-12 11:16:55 -04:00
Michael Abashian
3aabb18c92 Merge pull request #2932 from mabashian/more-job-details-search-fixes
Fix bug where filtering failed tasks was throwing JS error
2016-07-12 10:38:42 -04:00
AlanCoding
0fcc9abd69 allow org auditors to see notifications 2016-07-12 10:30:44 -04:00
kensible
fecdbd58a0 Merge pull request #2931 from kensible/2925-parsetype-invalidjson
Correctly redraw codemirror instance on invalid json error
2016-07-12 10:06:17 -04:00
Michael Abashian
5141fc6e6a Fix bug where filtering failed tasks was throwing JS error 2016-07-12 09:56:29 -04:00
Ken Hoes
8a5ddef6fb Correctly redraw codemirror instance on invalid json error 2016-07-12 09:48:28 -04:00
Alan Rominger
18bc32d248 Merge pull request #2930 from AlanCoding/2929_org_auditors_NT
Allow org auditors to view notification templates
2016-07-12 09:32:51 -04:00
AlanCoding
f68495cf58 allow org auditors to view notification templates 2016-07-12 09:18:04 -04:00
Wayne Witzel III
f9707c0ca1 Merge pull request #2922 from wwitzel3/issue-2508
ensure CustomInventoryScripts render correctly in the ActivityStream
2016-07-12 08:28:43 -04:00
Alan Rominger
feb94139c4 Merge pull request #2924 from AlanCoding/leftover_related
Add missing roles to select_related
2016-07-11 17:06:03 -04:00
AlanCoding
1b613d919b include all roles in the select_related 2016-07-11 16:51:29 -04:00
jlmitch5
98a1244655 Merge pull request #2921 from jlmitch5/fixSchedDatepicker
fix scheduler datepicker issues
2016-07-11 15:42:21 -04:00
Wayne Witzel III
f7e9d07dad ensure CustomInventoryScripts render correctly in the ActivityStream 2016-07-11 15:25:35 -04:00
Akita Noek
1aeca1bebb Merge pull request #2919 from anoek/2918
Several system auditor fixes to allow SA's to read and see things
2016-07-11 15:23:36 -04:00
John Mitchell
d0aa28e9b8 fix scheduler datepicker issues 2016-07-11 15:16:15 -04:00
Akita Noek
fd461a9768 Remove redundant check 2016-07-11 15:05:35 -04:00
Jared Tabor
bd82a7e930 Merge pull request #2920 from jaredevantabor/test-notifications
Add additional polling if test notification is "pending"
2016-07-11 11:57:43 -07:00
Matthew Jones
2f843d15e0 Also forcefully kill the main process 2016-07-11 14:45:41 -04:00
Akita Noek
ec37703ce8 Allow SA's to read all notification templates 2016-07-11 14:44:36 -04:00
Akita Noek
4c67c50373 Allow system auditors to see notification templates and management jobs in the UI 2016-07-11 14:42:01 -04:00
Leigh Johnson
ac5a5c574d Merge branch '2841' into release_3.0.0 2016-07-11 14:41:54 -04:00
Matthew Jones
43c5105a57 No more Mr. Nice Tower
or how I learned to stop worrying and use SIGKILL.

Ansible has a bug that could potentially leave tower's jobs hanging
around indefinitely requiring manual shell intervention.   I'm going to
put this here and until Ansible can get to the bottom of it.
2016-07-11 14:37:09 -04:00
Leigh Johnson
985c23dbb4 incorporate mabashians changes in #2896 2016-07-11 14:29:59 -04:00
Akita Noek
6de5cceb8f More is_system_auditor checks in views.py 2016-07-11 14:28:26 -04:00
Jared Tabor
999c3d8292 capping pending retries at 10 2016-07-11 11:15:38 -07:00
Jared Tabor
148b59d628 Add additional polling if test notification is "pending" 2016-07-11 11:11:53 -07:00
Akita Noek
134b60dbed Switch to explicit checks for system auditor for all applicable get_queryset calls
Solves #2918 and probably a couple other corner cases where orphan
situations could happen
2016-07-11 14:06:40 -04:00