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
Jared Tabor
1e037098f2
Merge pull request #2914 from jaredevantabor/ux-audit
...
1px white border for any status icon within a tooltip
2016-07-11 11:03:35 -07:00
Michael Abashian
1af6d1d026
Merge pull request #2912 from mabashian/portal-mode-jobs-filter
...
Fixed bug where created_by filter was lost when adding a search tag to Portal Mode - Jobs List
2016-07-11 13:59:43 -04:00
Leigh Johnson
0d1f5f1e54
resolves kickback on #2841
2016-07-11 13:40:55 -04:00
Michael Abashian
e0b619f707
Merge pull request #2899 from mabashian/event-summary-filter
...
Fix bug where backspacing event summary host filter would bork the list
2016-07-11 13:37:57 -04:00
Michael Abashian
edc120fe58
Merge pull request #2898 from mabashian/edit-indictor-host-edit
...
Added row/list being edited logic to home/hosts
2016-07-11 13:37:33 -04:00
Michael Abashian
3f19f3c6d2
Deep clone the PortalJobsList so that we don't modify the base config
2016-07-11 13:34:20 -04:00
Chris Meyers
120d2eda33
Merge pull request #2915 from chrismeyersfsu/fix-label-docs
...
fix label docs
2016-07-11 13:34:00 -04:00
Chris Meyers
5a9af010bf
fix label docs
2016-07-11 13:32:53 -04:00
Jared Tabor
c09a08e012
Merge pull request #2910 from jaredevantabor/monkey-punch
...
XSS sanitize permissions-popover
2016-07-11 10:22:11 -07:00
Jared Tabor
0eee38ab10
1px white border for any status icon within a tooltip
2016-07-11 10:17:43 -07:00
Shane McDonald
d9e31c53eb
Merge pull request #2909 from leigh-johnson/2862
...
Fix tag search / filter by 'type' in Job > related Schedules list view
2016-07-11 13:14:01 -04:00
Shane McDonald
d3aadd4847
Removing console.logs
2016-07-11 13:13:27 -04:00
Michael Abashian
62351f18ce
Fixed bug where created_by filter was lost when adding a search tag
2016-07-11 13:08:37 -04:00
Alan Rominger
c8b8cdf7f5
Merge pull request #2906 from AlanCoding/2875_old_launch
...
Fix old method of launching jobs by directly raising validation errors
2016-07-11 12:46:23 -04:00
Jared Tabor
b4d489ff1b
XSS sanitize permissions popover
...
and remove-permissions modal
2016-07-11 09:28:25 -07:00
Akita Noek
f7ecfb13a5
Merge pull request #2900 from wenottingham/f-branch
...
Fix paste-o in tooltip.
2016-07-11 12:26:42 -04:00
Akita Noek
d936c8f344
Merge pull request #2901 from anoek/2893
...
Swap order of save / cancel buttons for add permissions modal
2016-07-11 12:26:24 -04:00
Leigh Johnson
c721e234e2
resolves kickback on #2862
2016-07-11 12:23:30 -04:00
Leigh Johnson
fed8a83b08
fixed kickback on #2795 ( #2884 )
2016-07-11 12:09:16 -04:00
Chris Meyers
dac460c2f8
Merge pull request #2907 from chrismeyersfsu/fix-ubuntu_repo_modes
...
dont quote permission mode param
2016-07-11 11:55:06 -04:00
AlanCoding
3e433dc9f3
Remove old method of appending errors because it makes attrs None, causing server errors
2016-07-11 11:27:08 -04:00
John Mitchell
37fdfb3444
fixed list labels on dashboard
2016-07-11 11:10:02 -04:00
Akita Noek
02732a26df
Swap order of save / cancel buttons for add permissions modal
...
#2893
2016-07-11 11:02:03 -04:00
Bill Nottingham
3cfc0131e1
Fix paste-o in tooltip.
...
Related: #2892
2016-07-11 10:55:45 -04:00
Jared Tabor
3c1d3d43f8
Merge pull request #2891 from jaredevantabor/launch-icons
...
Update all fa fa-rocket icons to new 3.0 launch icon
2016-07-11 07:53:54 -07:00
Michael Abashian
0506162ba3
Take the searchActive flag into account when hiding the event summary hosts table
2016-07-11 10:45:07 -04:00
jlmitch5
53b705f1bb
Merge pull request #2888 from jlmitch5/fixTableRowLayout
...
give description column top/bottom padding, and center action cell for tall rows
2016-07-11 10:26:19 -04:00
Matthew Jones
6447434aa1
Hanele credential in notifications when deleted
2016-07-11 10:16:33 -04:00
Michael Abashian
d40d7c90f5
Added row/list being edited logic to home/hosts
2016-07-11 10:01:44 -04:00
